Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef821ae7 authored by David Sterba's avatar David Sterba Committed by Greg Kroah-Hartman
Browse files

USB: xhci: Use GFP_ATOMIC under spin_lock 



coccinelle check scripts/coccinelle/locks/call_kern.cocci found that
in drivers/usb/host/xhci.c an allocation with GFP_KERNEL is done
with locks held:

xhci_resume
  spin_lock_irq(xhci->lock)
    xhci_setup_msix
      kmalloc(GFP_KERNEL)

Change it to GFP_ATOMIC.

Signed-off-by: default avatarDavid Sterba <dsterba@suse.cz>
CC: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4b4cd731

drivers/usb/host/xhci.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -240,7 +240,7 @@ static int xhci_setup_msix(struct xhci_hcd *xhci) 




	xhci->msix_entries =

	xhci->msix_entries =

		kmalloc((sizeof(struct msix_entry))*xhci->msix_count,

		kmalloc((sizeof(struct msix_entry))*xhci->msix_count,

				GFP_KERNEL);

				GFP_ATOMIC);

	if (!xhci->msix_entries) {

	if (!xhci->msix_entries) {

		xhci_err(xhci, "Failed to allocate MSI-X entries\n");

		xhci_err(xhci, "Failed to allocate MSI-X entries\n");

		return -ENOMEM;

		return -ENOMEM;