Revert "USB: xhci: Use GFP_ATOMIC under spin_lock"
authorGreg Kroah-Hartman <gregkh@suse.de>
Thu, 11 Nov 2010 17:41:02 +0000 (09:41 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 11 Nov 2010 17:41:02 +0000 (09:41 -0800)
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>
drivers/usb/host/xhci.c

index 8ddc965718abc194a1ac7d451a9b2e0159efb55e..5d7d4e951ea4bc951c4783729472467a383ec1c2 100644 (file)
@@ -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;