From e2428ebd83861f693ac94cbe2662021d4e7f3775 Mon Sep 17 00:00:00 2001 From: jogo Date: Tue, 23 Apr 2013 13:55:36 +0000 Subject: bcm63xx: update patches with upstream submissions git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36407 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ...-don-t-disable-non-enabled-clocks-in-prob.patch | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 target/linux/brcm63xx/patches-3.8/004-spi-bcm63xx-don-t-disable-non-enabled-clocks-in-prob.patch (limited to 'target/linux/brcm63xx/patches-3.8/004-spi-bcm63xx-don-t-disable-non-enabled-clocks-in-prob.patch') 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 000000000..0a037074f --- /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 +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 +--- + 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 */ -- cgit v1.2.3