diff options
| author |   Hyeonggon Yoo <42.hyeyoo@gmail.com> | 2021-05-29 19:03:57 +0900 |
|---|---|---|
| committer |   Jiri Kosina <jkosina@suse.cz> | 2021-06-15 10:50:36 +0200 |
| commit | a3af901c89685acb590b49ce054ea7e3015a770a (patch) | |
| tree | c0699dfd083af0f74af36913627c7c97d6a2379b /drivers/hid/usbhid | |
| parent | HID: amd_sfh: change in maintainer (diff) | |
| download | linux-dev-a3af901c89685acb590b49ce054ea7e3015a770a.tar.xz linux-dev-a3af901c89685acb590b49ce054ea7e3015a770a.zip | |
HID: usbkbd: Avoid GFP_ATOMIC when GFP_KERNEL is possible
usb_kbd_alloc_mem is called in usb_kbd_probe, which is
not in atomic context. So constraints can be relaxed here.
Use GFP_KERNEL instead of GFP_ATOMIC.
Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/usbhid')
| -rw-r--r-- | drivers/hid/usbhid/usbkbd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/usbhid/usbkbd.c b/drivers/hid/usbhid/usbkbd.c index e22434dfc9ef..df02002066ce 100644 --- a/drivers/hid/usbhid/usbkbd.c +++ b/drivers/hid/usbhid/usbkbd.c @@ -239,11 +239,11 @@ static int usb_kbd_alloc_mem(struct usb_device *dev, struct usb_kbd *kbd) return -1; if (!(kbd->led = usb_alloc_urb(0, GFP_KERNEL))) return -1; - if (!(kbd->new = usb_alloc_coherent(dev, 8, GFP_ATOMIC, &kbd->new_dma))) + if (!(kbd->new = usb_alloc_coherent(dev, 8, GFP_KERNEL, &kbd->new_dma))) return -1; if (!(kbd->cr = kmalloc(sizeof(struct usb_ctrlrequest), GFP_KERNEL))) return -1; - if (!(kbd->leds = usb_alloc_coherent(dev, 1, GFP_ATOMIC, &kbd->leds_dma))) + if (!(kbd->leds = usb_alloc_coherent(dev, 1, GFP_KERNEL, &kbd->leds_dma))) return -1; return 0; |