Skip to content

Commit 6b9c8c8

Browse files
committed
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>
2 parents f1466cd + a6f2f0f commit 6b9c8c8

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/soc/xilinx/zynqmp_power.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ static int zynqmp_pm_probe(struct platform_device *pdev)
205205
rx_chan = mbox_request_channel_byname(client, "rx");
206206
if (IS_ERR(rx_chan)) {
207207
dev_err(&pdev->dev, "Failed to request rx channel\n");
208-
return IS_ERR(rx_chan);
208+
return PTR_ERR(rx_chan);
209209
}
210210
} else if (of_find_property(pdev->dev.of_node, "interrupts", NULL)) {
211211
irq = platform_get_irq(pdev, 0);

0 commit comments

Comments
 (0)