Commit a3af901c authored by Hyeonggon Yoo's avatar Hyeonggon Yoo Committed by Jiri Kosina
Browse files

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: default avatarHyeonggon Yoo <42.hyeyoo@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 04c22eea

drivers/hid/usbhid/usbkbd.c

+2 −2
Original line number Diff line number Diff line
@@ -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;