Merge branch 'akpm-current/current'

[karo-tx-linux.git] / drivers / usb / host / u132-hcd.c

diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c
index 0a94895a358d47e8e51cf32722afbdce0d6104d9..692ccc69345e4a9998246a53b6af817a56a5d435 100644 (file)
--- a/drivers/usb/host/u132-hcd.c
+++ b/drivers/usb/host/u132-hcd.c
@@ -2244,7 +2244,7 @@ static int u132_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
 {
        struct u132 *u132 = hcd_to_u132(hcd);
        if (irqs_disabled()) {
-               if (__GFP_WAIT & mem_flags) {
+               if (gfpflags_allow_blocking(mem_flags)) {
                        printk(KERN_ERR "invalid context for function that might sleep\n");
                        return -EINVAL;
                }