Commit 6b9c8c8b authored by Olof Johansson's avatar Olof Johansson

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.comSigned-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f1466cdd a6f2f0fd
...@@ -205,7 +205,7 @@ static int zynqmp_pm_probe(struct platform_device *pdev) ...@@ -205,7 +205,7 @@ static int zynqmp_pm_probe(struct platform_device *pdev)
rx_chan = mbox_request_channel_byname(client, "rx"); rx_chan = mbox_request_channel_byname(client, "rx");
if (IS_ERR(rx_chan)) { if (IS_ERR(rx_chan)) {
dev_err(&pdev->dev, "Failed to request rx channel\n"); 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)) { } else if (of_find_property(pdev->dev.of_node, "interrupts", NULL)) {
irq = platform_get_irq(pdev, 0); irq = platform_get_irq(pdev, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment