diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-05-02 13:56:48 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-05-02 13:56:48 +0200 |
commit | 0e509f537f8ddd89f237e62f77818dbdbc8be395 (patch) | |
tree | 4e747a1cad81d0c085d435923366bcce30484bc8 /drivers/bus/fsl-mc | |
parent | f8ae07f4b8bfde0f33761e1a1aaee45a4e85e9d6 (diff) | |
parent | 672c0c5173427e6b3e2a9bbb7be51ceeec78093a (diff) | |
download | linux-0e509f537f8ddd89f237e62f77818dbdbc8be395.tar.gz linux-0e509f537f8ddd89f237e62f77818dbdbc8be395.tar.bz2 linux-0e509f537f8ddd89f237e62f77818dbdbc8be395.zip |
Merge 5.18-rc5 into driver-core-next
We need the kernfs/driver core fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/bus/fsl-mc')
-rw-r--r-- | drivers/bus/fsl-mc/fsl-mc-msi.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/bus/fsl-mc/fsl-mc-msi.c b/drivers/bus/fsl-mc/fsl-mc-msi.c index 5e0e4393ce4d..0cfe859a4ac4 100644 --- a/drivers/bus/fsl-mc/fsl-mc-msi.c +++ b/drivers/bus/fsl-mc/fsl-mc-msi.c @@ -224,8 +224,12 @@ int fsl_mc_msi_domain_alloc_irqs(struct device *dev, unsigned int irq_count) if (error) return error; + msi_lock_descs(dev); if (msi_first_desc(dev, MSI_DESC_ALL)) - return -EINVAL; + error = -EINVAL; + msi_unlock_descs(dev); + if (error) + return error; /* * NOTE: Calling this function will trigger the invocation of the |