Browse Source

Revert "USB: xhci: Use GFP_ATOMIC under spin_lock"

This reverts commit ef821ae70fc35a76bdce7e07c70a1a7c2c33cdb9.

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>
Greg Kroah-Hartman 14 years ago
parent
commit
868719752d
1 changed files with 1 additions and 1 deletions
  1. 1 1
      drivers/usb/host/xhci.c

+ 1 - 1
drivers/usb/host/xhci.c

@@ -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;