Allocate the MSI device data on first invocation of the allocation function.

Signed-off-by: Thomas Gleixner <t...@linutronix.de>
Cc: Stuart Yoder <stuyo...@gmail.com>
Cc: Laurentiu Tudor <laurentiu.tu...@nxp.com>
---
 drivers/bus/fsl-mc/fsl-mc-msi.c |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

--- a/drivers/bus/fsl-mc/fsl-mc-msi.c
+++ b/drivers/bus/fsl-mc/fsl-mc-msi.c
@@ -253,6 +253,14 @@ int fsl_mc_msi_domain_alloc_irqs(struct
        struct irq_domain *msi_domain;
        int error;
 
+       msi_domain = dev_get_msi_domain(dev);
+       if (!msi_domain)
+               return -EINVAL;
+
+       error = msi_setup_device_data(dev);
+       if (error)
+               return error;
+
        if (!list_empty(dev_to_msi_list(dev)))
                return -EINVAL;
 
@@ -260,12 +268,6 @@ int fsl_mc_msi_domain_alloc_irqs(struct
        if (error < 0)
                return error;
 
-       msi_domain = dev_get_msi_domain(dev);
-       if (!msi_domain) {
-               error = -EINVAL;
-               goto cleanup_msi_descs;
-       }
-
        /*
         * NOTE: Calling this function will trigger the invocation of the
         * its_fsl_mc_msi_prepare() callback

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

Reply via email to