drm/amdgpu: enable GFX IP v11.0.4 CG support

[platform/kernel/linux-starfive.git] / drivers / mailbox / zynqmp-ipi-mailbox.c

diff --git a/drivers/mailbox/zynqmp-ipi-mailbox.c b/drivers/mailbox/zynqmp-ipi-mailbox.c
index 31a0fa9..12e004f 100644 (file)
--- a/drivers/mailbox/zynqmp-ipi-mailbox.c
+++ b/drivers/mailbox/zynqmp-ipi-mailbox.c
@@ -493,6 +493,7 @@ static int zynqmp_ipi_mbox_probe(struct zynqmp_ipi_mbox *ipi_mbox,
        ret = device_register(&ipi_mbox->dev);
        if (ret) {
                dev_err(dev, "Failed to register ipi mbox dev.\n");
+               put_device(&ipi_mbox->dev);
                return ret;
        }
        mdev = &ipi_mbox->dev;
@@ -619,7 +620,8 @@ static void zynqmp_ipi_free_mboxes(struct zynqmp_ipi_pdata *pdata)
                ipi_mbox = &pdata->ipi_mboxes[i];
                if (ipi_mbox->dev.parent) {
                        mbox_controller_unregister(&ipi_mbox->mbox);
-                       device_unregister(&ipi_mbox->dev);
+                       if (device_is_registered(&ipi_mbox->dev))
+                               device_unregister(&ipi_mbox->dev);
                }
        }
 }