Commit 86871975 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Revert "USB: xhci: Use GFP_ATOMIC under spin_lock"

This reverts commit ef821ae7.

The correct thing to do is to drop the spinlock, not change
the GFP flag here.

Thanks to Sarah for pointing out I shouldn't have taken this patch in
the first place.

Cc: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: David Sterba <dsterba@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1c0a3803
...@@ -240,7 +240,7 @@ static int xhci_setup_msix(struct xhci_hcd *xhci) ...@@ -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_ATOMIC); GFP_KERNEL);
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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment