diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2013-04-23 13:55:36 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2013-04-23 13:55:36 +0000 |
| commit | 90986b5581772a3767f5af2cadbde7310a3df296 (patch) | |
| tree | 5a83f720d472bd1e039b021f92b9ff552d16cbe2 /target/linux/brcm63xx/patches-3.8/004-spi-bcm63xx-don-t-disable-non-enabled-clocks-in-prob.patch | |
| parent | 2a1a16d2d55b02dd145db1be84999b88895595e5 (diff) | |
| download | upstream-90986b5581772a3767f5af2cadbde7310a3df296.tar.gz upstream-90986b5581772a3767f5af2cadbde7310a3df296.tar.bz2 upstream-90986b5581772a3767f5af2cadbde7310a3df296.zip | |
bcm63xx: update patches with upstream submissions
SVN-Revision: 36407
Diffstat (limited to 'target/linux/brcm63xx/patches-3.8/004-spi-bcm63xx-don-t-disable-non-enabled-clocks-in-prob.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.8/004-spi-bcm63xx-don-t-disable-non-enabled-clocks-in-prob.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.8/004-spi-bcm63xx-don-t-disable-non-enabled-clocks-in-prob.patch b/target/linux/brcm63xx/patches-3.8/004-spi-bcm63xx-don-t-disable-non-enabled-clocks-in-prob.patch new file mode 100644 index 0000000000..0a037074fe --- /dev/null +++ b/target/linux/brcm63xx/patches-3.8/004-spi-bcm63xx-don-t-disable-non-enabled-clocks-in-prob.patch @@ -0,0 +1,26 @@ +From f32b46ec9c307753e2418a0f5df1b5cd066b1394 Mon Sep 17 00:00:00 2001 +From: Jonas Gorski <jogo@openwrt.org> +Date: Mon, 11 Mar 2013 13:27:43 +0100 +Subject: [PATCH 02/12] spi/bcm63xx: don't disable non enabled clocks in probe + error path + +When msg_ctl_width is set to an invalid value we try to disable the +clock despite it never being enabled. Fix it by jumping to the correct +label. + +Signed-off-by: Jonas Gorski <jogo@openwrt.org> +--- + drivers/spi/spi-bcm63xx.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/spi/spi-bcm63xx.c ++++ b/drivers/spi/spi-bcm63xx.c +@@ -489,7 +489,7 @@ static int bcm63xx_spi_probe(struct plat + default: + dev_err(dev, "unsupported MSG_CTL width: %d\n", + bs->msg_ctl_width); +- goto out_clk_disable; ++ goto out_err; + } + + /* Initialize hardware */ |