diff options
Diffstat (limited to 'drivers/usb/input/usbkbd.c')
-rw-r--r-- | drivers/usb/input/usbkbd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/input/usbkbd.c b/drivers/usb/input/usbkbd.c index dac88640eab6..8505824848f6 100644 --- a/drivers/usb/input/usbkbd.c +++ b/drivers/usb/input/usbkbd.c | |||
@@ -122,7 +122,7 @@ static void usb_kbd_irq(struct urb *urb) | |||
122 | memcpy(kbd->old, kbd->new, 8); | 122 | memcpy(kbd->old, kbd->new, 8); |
123 | 123 | ||
124 | resubmit: | 124 | resubmit: |
125 | i = usb_submit_urb (urb, SLAB_ATOMIC); | 125 | i = usb_submit_urb (urb, GFP_ATOMIC); |
126 | if (i) | 126 | if (i) |
127 | err ("can't resubmit intr, %s-%s/input0, status %d", | 127 | err ("can't resubmit intr, %s-%s/input0, status %d", |
128 | kbd->usbdev->bus->bus_name, | 128 | kbd->usbdev->bus->bus_name, |
@@ -196,11 +196,11 @@ static int usb_kbd_alloc_mem(struct usb_device *dev, struct usb_kbd *kbd) | |||
196 | return -1; | 196 | return -1; |
197 | if (!(kbd->led = usb_alloc_urb(0, GFP_KERNEL))) | 197 | if (!(kbd->led = usb_alloc_urb(0, GFP_KERNEL))) |
198 | return -1; | 198 | return -1; |
199 | if (!(kbd->new = usb_buffer_alloc(dev, 8, SLAB_ATOMIC, &kbd->new_dma))) | 199 | if (!(kbd->new = usb_buffer_alloc(dev, 8, GFP_ATOMIC, &kbd->new_dma))) |
200 | return -1; | 200 | return -1; |
201 | if (!(kbd->cr = usb_buffer_alloc(dev, sizeof(struct usb_ctrlrequest), SLAB_ATOMIC, &kbd->cr_dma))) | 201 | if (!(kbd->cr = usb_buffer_alloc(dev, sizeof(struct usb_ctrlrequest), GFP_ATOMIC, &kbd->cr_dma))) |
202 | return -1; | 202 | return -1; |
203 | if (!(kbd->leds = usb_buffer_alloc(dev, 1, SLAB_ATOMIC, &kbd->leds_dma))) | 203 | if (!(kbd->leds = usb_buffer_alloc(dev, 1, GFP_ATOMIC, &kbd->leds_dma))) |
204 | return -1; | 204 | return -1; |
205 | 205 | ||
206 | return 0; | 206 | return 0; |