diff options
Diffstat (limited to 'drivers/usb/input/hid-core.c')
-rw-r--r-- | drivers/usb/input/hid-core.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c index 4295bab4f1e..f1d0e1d6982 100644 --- a/drivers/usb/input/hid-core.c +++ b/drivers/usb/input/hid-core.c | |||
@@ -1079,7 +1079,7 @@ static void hid_irq_in(struct urb *urb) | |||
1079 | warn("input irq status %d received", urb->status); | 1079 | warn("input irq status %d received", urb->status); |
1080 | } | 1080 | } |
1081 | 1081 | ||
1082 | status = usb_submit_urb(urb, SLAB_ATOMIC); | 1082 | status = usb_submit_urb(urb, GFP_ATOMIC); |
1083 | if (status) { | 1083 | if (status) { |
1084 | clear_bit(HID_IN_RUNNING, &hid->iofl); | 1084 | clear_bit(HID_IN_RUNNING, &hid->iofl); |
1085 | if (status != -EPERM) { | 1085 | if (status != -EPERM) { |
@@ -1864,13 +1864,13 @@ static void hid_find_max_report(struct hid_device *hid, unsigned int type, int * | |||
1864 | 1864 | ||
1865 | static int hid_alloc_buffers(struct usb_device *dev, struct hid_device *hid) | 1865 | static int hid_alloc_buffers(struct usb_device *dev, struct hid_device *hid) |
1866 | { | 1866 | { |
1867 | if (!(hid->inbuf = usb_buffer_alloc(dev, hid->bufsize, SLAB_ATOMIC, &hid->inbuf_dma))) | 1867 | if (!(hid->inbuf = usb_buffer_alloc(dev, hid->bufsize, GFP_ATOMIC, &hid->inbuf_dma))) |
1868 | return -1; | 1868 | return -1; |
1869 | if (!(hid->outbuf = usb_buffer_alloc(dev, hid->bufsize, SLAB_ATOMIC, &hid->outbuf_dma))) | 1869 | if (!(hid->outbuf = usb_buffer_alloc(dev, hid->bufsize, GFP_ATOMIC, &hid->outbuf_dma))) |
1870 | return -1; | 1870 | return -1; |
1871 | if (!(hid->cr = usb_buffer_alloc(dev, sizeof(*(hid->cr)), SLAB_ATOMIC, &hid->cr_dma))) | 1871 | if (!(hid->cr = usb_buffer_alloc(dev, sizeof(*(hid->cr)), GFP_ATOMIC, &hid->cr_dma))) |
1872 | return -1; | 1872 | return -1; |
1873 | if (!(hid->ctrlbuf = usb_buffer_alloc(dev, hid->bufsize, SLAB_ATOMIC, &hid->ctrlbuf_dma))) | 1873 | if (!(hid->ctrlbuf = usb_buffer_alloc(dev, hid->bufsize, GFP_ATOMIC, &hid->ctrlbuf_dma))) |
1874 | return -1; | 1874 | return -1; |
1875 | 1875 | ||
1876 | return 0; | 1876 | return 0; |