projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
HID: usbhid: Fix flood of "control queue full" messages
[linux-2.6-microblaze.git]
/
drivers
/
spi
/
spi-meson-spicc.c
diff --git
a/drivers/spi/spi-meson-spicc.c
b/drivers/spi/spi-meson-spicc.c
index
ecba6b4
..
b2c4621
100644
(file)
--- a/
drivers/spi/spi-meson-spicc.c
+++ b/
drivers/spi/spi-meson-spicc.c
@@
-725,7
+725,7
@@
static int meson_spicc_probe(struct platform_device *pdev)
ret = clk_prepare_enable(spicc->pclk);
if (ret) {
dev_err(&pdev->dev, "pclk clock enable failed\n");
ret = clk_prepare_enable(spicc->pclk);
if (ret) {
dev_err(&pdev->dev, "pclk clock enable failed\n");
- goto out_
master
;
+ goto out_
core_clk
;
}
device_reset_optional(&pdev->dev);
}
device_reset_optional(&pdev->dev);
@@
-752,7
+752,7
@@
static int meson_spicc_probe(struct platform_device *pdev)
ret = meson_spicc_clk_init(spicc);
if (ret) {
dev_err(&pdev->dev, "clock registration failed\n");
ret = meson_spicc_clk_init(spicc);
if (ret) {
dev_err(&pdev->dev, "clock registration failed\n");
- goto out_
master
;
+ goto out_
clk
;
}
ret = devm_spi_register_master(&pdev->dev, master);
}
ret = devm_spi_register_master(&pdev->dev, master);
@@
-764,9
+764,11
@@
static int meson_spicc_probe(struct platform_device *pdev)
return 0;
out_clk:
return 0;
out_clk:
- clk_disable_unprepare(spicc->core);
clk_disable_unprepare(spicc->pclk);
clk_disable_unprepare(spicc->pclk);
+out_core_clk:
+ clk_disable_unprepare(spicc->core);
+
out_master:
spi_master_put(master);
out_master:
spi_master_put(master);