summaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-03-12 00:13:37 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-12 19:11:31 +0000
commitb435ff212e91bddc2d12e6638a4d846d5f60daa6 (patch)
treea03234aebe1215fac562d1b828343dfbb8677eec /drivers/spi
parent4a25b680b1e84cf97c740c8005e2c6655d6cfa7f (diff)
downloadlinux-3.10-b435ff212e91bddc2d12e6638a4d846d5f60daa6.tar.gz
linux-3.10-b435ff212e91bddc2d12e6638a4d846d5f60daa6.tar.bz2
linux-3.10-b435ff212e91bddc2d12e6638a4d846d5f60daa6.zip
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> Acked-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-bcm63xx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c
index 0415a32cce3..d7df435d962 100644
--- a/drivers/spi/spi-bcm63xx.c
+++ b/drivers/spi/spi-bcm63xx.c
@@ -489,7 +489,7 @@ static int bcm63xx_spi_probe(struct platform_device *pdev)
default:
dev_err(dev, "unsupported MSG_CTL width: %d\n",
bs->msg_ctl_width);
- goto out_clk_disable;
+ goto out_err;
}
/* Initialize hardware */