diff --git a/[refs] b/[refs] index 7638cedbcb12..7e8c2fb6430e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4bb0ef193bae8ca881d14fa713a831c042147041 +refs/heads/master: 0cc1a51ff32cd54881a7e4d92ed89cee49843265 diff --git a/trunk/drivers/usb/core/hub.c b/trunk/drivers/usb/core/hub.c index b04d232d4c65..1b17f636f49c 100644 --- a/trunk/drivers/usb/core/hub.c +++ b/trunk/drivers/usb/core/hub.c @@ -2946,7 +2946,7 @@ static int config_descriptors_changed(struct usb_device *udev) if (len < le16_to_cpu(udev->config[index].desc.wTotalLength)) len = le16_to_cpu(udev->config[index].desc.wTotalLength); } - buf = kmalloc (len, GFP_KERNEL); + buf = kmalloc(len, GFP_NOIO); if (buf == NULL) { dev_err(&udev->dev, "no mem to re-read configs after reset\n"); /* assume the worst */