diff options
| author | Olof Johansson <olof@lixom.net> | 2020-10-03 12:13:56 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2020-10-03 12:13:59 -0700 |
| commit | 6b9c8c8bb789c5387f2297dd3c68a2d61b3f935e (patch) | |
| tree | 3eb2d10f5f61660b2853475c7744afb497b8dc32 /drivers/soc | |
| parent | f1466cdd82f486252787048ad50b2c6695dc70e6 (diff) | |
| parent | a6f2f0fdc73aacc6e10ae48ae78634dba26702d4 (diff) | |
Merge tag 'zynqmp-soc-for-v5.9-v2' of https://github.com/Xilinx/linux-xlnx into arm/fixes
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>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/xilinx/zynqmp_power.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/soc/xilinx/zynqmp_power.c b/drivers/soc/xilinx/zynqmp_power.c index 31ff49fcd078..c556623dae02 100644 --- 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); |