projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c708379
0158026
)
Merge remote-tracking branch 'spi/fix/clps711x' into spi-clps711x
author
Mark Brown
<broonie@linaro.org>
Thu, 3 Oct 2013 16:25:40 +0000
(17:25 +0100)
committer
Mark Brown
<broonie@linaro.org>
Thu, 3 Oct 2013 16:25:40 +0000
(17:25 +0100)
Conflicts:
drivers/spi/spi-clps711x.c
1
2
drivers/spi/spi-clps711x.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/spi/spi-clps711x.c
index
1a78683
,
6416798
..
73b9a46
---
1
/
drivers/spi/spi-clps711x.c
---
2
/
drivers/spi/spi-clps711x.c
+++ b/
drivers/spi/spi-clps711x.c
@@@
-226,8
-226,7
+226,7
@@@
static int spi_clps711x_probe(struct pl
dev_name(&pdev->dev), hw);
if (ret) {
dev_err(&pdev->dev, "Can't request IRQ\n");
- clk_put(hw->spi_clk);
- goto clk_out;
+ goto err_out;
}
ret = spi_register_master(master);