Skip to content

Commit

Permalink
Revert "USB: xhci: Use GFP_ATOMIC under spin_lock"
Browse files Browse the repository at this point in the history
This reverts commit ef821ae.

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: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Greg Kroah-Hartman committed Nov 11, 2010
1 parent 1c0a380 commit 8687197
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/usb/host/xhci.c
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ static int xhci_setup_msix(struct xhci_hcd *xhci)

xhci->msix_entries =
kmalloc((sizeof(struct msix_entry))*xhci->msix_count,
GFP_ATOMIC);
GFP_KERNEL);
if (!xhci->msix_entries) {
xhci_err(xhci, "Failed to allocate MSI-X entries\n");
return -ENOMEM;
Expand Down

0 comments on commit 8687197

Please sign in to comment.