Commit d4af0c17 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'irq_urgent_for_v5.18_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq fix from Borislav Petkov:

 - Fix locking when accessing device MSI descriptors

* tag 'irq_urgent_for_v5.18_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  bus: fsl-mc-msi: Fix MSI descriptor mutex lock for msi_first_desc()
parents 57ae8a49 c7d2f89f

drivers/bus/fsl-mc/fsl-mc-msi.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -224,8 +224,12 @@ int fsl_mc_msi_domain_alloc_irqs(struct device *dev, unsigned int irq_count) 
	if (error)

	if (error)

		return error;

		return error;





	msi_lock_descs(dev);

	if (msi_first_desc(dev, MSI_DESC_ALL))

	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

	 * NOTE: Calling this function will trigger the invocation of the