projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WORKAROUND: usb: gadget: composite: Set usb_req len with additional bytes
[platform/kernel/linux-starfive.git]
/
drivers
/
spi
/
spi-cadence-quadspi.c
diff --git
a/drivers/spi/spi-cadence-quadspi.c
b/drivers/spi/spi-cadence-quadspi.c
index
b50db71
..
2064dc4
100644
(file)
--- a/
drivers/spi/spi-cadence-quadspi.c
+++ b/
drivers/spi/spi-cadence-quadspi.c
@@
-1825,7
+1825,7
@@
static int cqspi_probe(struct platform_device *pdev)
if (ddata->jh7110_clk_init) {
ret = cqspi_jh7110_clk_init(pdev, cqspi);
if (ret)
if (ddata->jh7110_clk_init) {
ret = cqspi_jh7110_clk_init(pdev, cqspi);
if (ret)
- goto probe_
clk
_failed;
+ goto probe_
reset
_failed;
}
if (of_device_is_compatible(pdev->dev.of_node,
}
if (of_device_is_compatible(pdev->dev.of_node,
@@
-1872,6
+1872,8
@@
static int cqspi_probe(struct platform_device *pdev)
probe_setup_failed:
cqspi_controller_enable(cqspi, 0);
probe_reset_failed:
probe_setup_failed:
cqspi_controller_enable(cqspi, 0);
probe_reset_failed:
+ if (cqspi->is_jh7110)
+ cqspi_jh7110_disable_clk(pdev, cqspi);
clk_disable_unprepare(cqspi->clk);
probe_clk_failed:
pm_runtime_put_sync(dev);
clk_disable_unprepare(cqspi->clk);
probe_clk_failed:
pm_runtime_put_sync(dev);