diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2021-06-30 10:03:51 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2021-06-30 10:03:51 +0300 |
| commit | fd73788ce6a580f2bd353e0f364d31b6c16dcd12 (patch) | |
| tree | dbeecdd8155a9c1c6be3d85739d3740243907c2e /drivers/hid/usbhid | |
| parent | 5a94296bc02ac616336da7b5332b86d2ca8827f0 (diff) | |
| parent | bcfa8d14570d85c998a9b706b074ab151b286edf (diff) | |
| download | linux-fd73788ce6a580f2bd353e0f364d31b6c16dcd12.tar.xz | |
Merge branch 'for-5.14/core' into for-linus
- device unbinding locking fix from Dmitry Torokhov
- support for programmable buttons (mapping to KEY_MACRO# event codes)
from Thomas Weißschuh
- various other small fixes and code style improvements
Diffstat (limited to 'drivers/hid/usbhid')
| -rw-r--r-- | drivers/hid/usbhid/usbmouse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/usbhid/usbmouse.c b/drivers/hid/usbhid/usbmouse.c index 073127e65ac1..c89332017d5d 100644 --- a/drivers/hid/usbhid/usbmouse.c +++ b/drivers/hid/usbhid/usbmouse.c @@ -130,7 +130,7 @@ static int usb_mouse_probe(struct usb_interface *intf, const struct usb_device_i if (!mouse || !input_dev) goto fail1; - mouse->data = usb_alloc_coherent(dev, 8, GFP_ATOMIC, &mouse->data_dma); + mouse->data = usb_alloc_coherent(dev, 8, GFP_KERNEL, &mouse->data_dma); if (!mouse->data) goto fail1; |