projects
/
deliverable
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
1e8081d
)
Merge remote-tracking branch 'spi/topic/clps711x' into spi-next
author
Mark Brown
<broonie@linaro.org>
Fri, 25 Oct 2013 08:51:24 +0000
(09:51 +0100)
committer
Mark Brown
<broonie@linaro.org>
Fri, 25 Oct 2013 08:51:24 +0000
(09:51 +0100)
drivers/spi/spi-clps711x.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/spi/spi-clps711x.c
b/drivers/spi/spi-clps711x.c
index 7f2fd33ad4d918de4c60263d19840b1c9611c7ec..e2a5a426b2efc57038503ed7b64d00237e190b14 100644
(file)
--- 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]))
This page took
0.024821 seconds
and
5
git commands to generate.