|
@@ -906,11 +906,11 @@ char *usb_cache_string(struct usb_device *udev, int index)
|
|
|
if (index <= 0)
|
|
|
return NULL;
|
|
|
|
|
|
- buf = kmalloc(MAX_USB_STRING_SIZE, GFP_KERNEL);
|
|
|
+ buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
|
|
|
if (buf) {
|
|
|
len = usb_string(udev, index, buf, MAX_USB_STRING_SIZE);
|
|
|
if (len > 0) {
|
|
|
- smallbuf = kmalloc(++len, GFP_KERNEL);
|
|
|
+ smallbuf = kmalloc(++len, GFP_NOIO);
|
|
|
if (!smallbuf)
|
|
|
return buf;
|
|
|
memcpy(smallbuf, buf, len);
|
|
@@ -1731,7 +1731,7 @@ int usb_set_configuration(struct usb_device *dev, int configuration)
|
|
|
if (cp) {
|
|
|
nintf = cp->desc.bNumInterfaces;
|
|
|
new_interfaces = kmalloc(nintf * sizeof(*new_interfaces),
|
|
|
- GFP_KERNEL);
|
|
|
+ GFP_NOIO);
|
|
|
if (!new_interfaces) {
|
|
|
dev_err(&dev->dev, "Out of memory\n");
|
|
|
return -ENOMEM;
|
|
@@ -1740,7 +1740,7 @@ int usb_set_configuration(struct usb_device *dev, int configuration)
|
|
|
for (; n < nintf; ++n) {
|
|
|
new_interfaces[n] = kzalloc(
|
|
|
sizeof(struct usb_interface),
|
|
|
- GFP_KERNEL);
|
|
|
+ GFP_NOIO);
|
|
|
if (!new_interfaces[n]) {
|
|
|
dev_err(&dev->dev, "Out of memory\n");
|
|
|
ret = -ENOMEM;
|