summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-25 09:51:24 +0100
committerMark Brown <broonie@linaro.org>2013-10-25 09:51:24 +0100
commitd42b70f5c733478313433b24e66a1ff605f852bd (patch)
tree0d8ef0982271fd109a8ff67ef48682b573f7f4ae
parent1e8081da4d95be48d9e2b759594295f2ba35d52e (diff)
parent2b2322d662237a4b635a755df15e21b9ff80716b (diff)
Merge remote-tracking branch 'spi/topic/clps711x' into spi-next
-rw-r--r--drivers/spi/spi-clps711x.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/spi/spi-clps711x.c b/drivers/spi/spi-clps711x.c
index 7f2fd33ad4d9..e2a5a426b2ef 100644
--- a/drivers/spi/spi-clps711x.c
+++ b/drivers/spi/spi-clps711x.c
@@ -226,7 +226,7 @@ static int spi_clps711x_probe(struct platform_device *pdev)
dev_name(&pdev->dev), hw);
if (ret) {
dev_err(&pdev->dev, "Can't request IRQ\n");
- goto clk_out;
+ goto err_out;
}
ret = devm_spi_register_master(&pdev->dev, master);
@@ -239,7 +239,6 @@ static int spi_clps711x_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "Failed to register master\n");
-clk_out:
err_out:
while (--i >= 0)
if (gpio_is_valid(hw->chipselect[i]))