diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-08-11 23:24:46 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-08-11 23:24:46 -0700 |
| commit | 4aa31b4b61e4985e719352c329c3948d1932cb64 (patch) | |
| tree | 251d6d11d1e5c9c09adc3e0eb1715c56b2e16c95 /drivers/input/touchscreen/usbtouchscreen.c | |
| parent | 6bd744b723d229ac38eeea2cf0717d8cd2858032 (diff) | |
| parent | d45331b00ddb179e291766617259261c112db872 (diff) | |
| download | linux-4aa31b4b61e4985e719352c329c3948d1932cb64.tar.bz2 | |
Merge tag 'v5.3-rc4' into next
Sync up with mainline to bring in device_property_count_u32 andother
newer APIs.
Diffstat (limited to 'drivers/input/touchscreen/usbtouchscreen.c')
| -rw-r--r-- | drivers/input/touchscreen/usbtouchscreen.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c index a2cec6cacf57..16d70201de4a 100644 --- a/drivers/input/touchscreen/usbtouchscreen.c +++ b/drivers/input/touchscreen/usbtouchscreen.c @@ -1659,6 +1659,8 @@ static int usbtouch_probe(struct usb_interface *intf, if (!usbtouch || !input_dev) goto out_free; + mutex_init(&usbtouch->pm_mutex); + type = &usbtouch_dev_info[id->driver_info]; usbtouch->type = type; if (!type->process_pkt) |