diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-11 09:41:02 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-11 09:41:02 -0800 |
| commit | 868719752d60fb04a3714d77fdeb780b4d585faf (patch) | |
| tree | d13a8182ac18d7195e6c13c190225aace3a59472 /drivers/usb | |
| parent | 1c0a38038e8fcfaa6b5a81d53a4898f3f939f582 (diff) | |
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>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/host/xhci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 8ddc965718a..5d7d4e951ea 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -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; |