Merge tag 'staging-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[cascardo/linux.git] / drivers / staging / fsl-mc / bus / fsl-mc-msi.c

diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-msi.c b/drivers/staging/fsl-mc/bus/fsl-mc-msi.c
index bc1ad1a..3d46b1b 100644 (file)
--- a/drivers/staging/fsl-mc/bus/fsl-mc-msi.c
+++ b/drivers/staging/fsl-mc/bus/fsl-mc-msi.c
@@ -211,7 +211,7 @@ static int fsl_mc_msi_alloc_descs(struct device *dev, unsigned int irq_count)
        struct msi_desc *msi_desc;
 
        for (i = 0; i < irq_count; i++) {
-               msi_desc = alloc_msi_entry(dev);
+               msi_desc = alloc_msi_entry(dev, 1, NULL);
                if (!msi_desc) {
                        dev_err(dev, "Failed to allocate msi entry\n");
                        error = -ENOMEM;
@@ -219,7 +219,6 @@ static int fsl_mc_msi_alloc_descs(struct device *dev, unsigned int irq_count)
                }
 
                msi_desc->fsl_mc.msi_index = i;
-               msi_desc->nvec_used = 1;
                INIT_LIST_HEAD(&msi_desc->list);
                list_add_tail(&msi_desc->list, dev_to_msi_list(dev));
        }