projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
f1466cd
)
Merge tag 'zynqmp-soc-for-v5.9-v2' of https://github.com/Xilinx/linux-xlnx into arm...
author
Olof Johansson
<olof@lixom.net>
Sat, 3 Oct 2020 19:13:56 +0000
(12:13 -0700)
committer
Olof Johansson
<olof@lixom.net>
Sat, 3 Oct 2020 19:13:59 +0000
(12:13 -0700)
arm64: soc: ZynqMP SoC changes for v5.9-v2
- Fix error code in zynqmp_power driver
* tag 'zynqmp-soc-for-v5.9-v2' of https://github.com/Xilinx/linux-xlnx:
soc: xilinx: Fix error code in zynqmp_pm_probe()
Link:
https://lore.kernel.org/r/9b23dd60-45f4-cd7d-e81a-e8ab8e20af7c@xilinx.com
Signed-off-by: Olof Johansson <olof@lixom.net>
drivers/soc/xilinx/zynqmp_power.c
patch
|
blob
|
history
diff --git
a/drivers/soc/xilinx/zynqmp_power.c
b/drivers/soc/xilinx/zynqmp_power.c
index
31ff49f
..
c556623
100644
(file)
--- a/
drivers/soc/xilinx/zynqmp_power.c
+++ b/
drivers/soc/xilinx/zynqmp_power.c
@@
-205,7
+205,7
@@
static int zynqmp_pm_probe(struct platform_device *pdev)
rx_chan = mbox_request_channel_byname(client, "rx");
if (IS_ERR(rx_chan)) {
dev_err(&pdev->dev, "Failed to request rx channel\n");
- return
IS
_ERR(rx_chan);
+ return
PTR
_ERR(rx_chan);
}
} else if (of_find_property(pdev->dev.of_node, "interrupts", NULL)) {
irq = platform_get_irq(pdev, 0);