diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-07-08 13:39:28 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-07-08 13:39:28 -0700 |
| commit | a63f7778f76e1cf8ed3bcb7a1d9453c9609121ad (patch) | |
| tree | 9a26f3ff67dfbd542c6eca3e5c1c7f443b1647dd /drivers/input/mouse | |
| parent | Input: goodix - switch use of acpi_gpio_get_*_resource() APIs (diff) | |
| parent | Linux 5.19-rc5 (diff) | |
| download | linux-dev-a63f7778f76e1cf8ed3bcb7a1d9453c9609121ad.tar.xz linux-dev-a63f7778f76e1cf8ed3bcb7a1d9453c9609121ad.zip | |
Merge tag 'v5.19-rc5' into next
Merge with mainline to bring up the latest definition from MFD subsystem
needed for Mediatek keypad driver.
Diffstat (limited to 'drivers/input/mouse')
| -rw-r--r-- | drivers/input/mouse/bcm5974.c | 7 | ||||
| -rw-r--r-- | drivers/input/mouse/pxa930_trkball.c | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c index 59a14505b9cd..ca150618d32f 100644 --- a/drivers/input/mouse/bcm5974.c +++ b/drivers/input/mouse/bcm5974.c @@ -942,17 +942,22 @@ static int bcm5974_probe(struct usb_interface *iface, if (!dev->tp_data) goto err_free_bt_buffer; - if (dev->bt_urb) + if (dev->bt_urb) { usb_fill_int_urb(dev->bt_urb, udev, usb_rcvintpipe(udev, cfg->bt_ep), dev->bt_data, dev->cfg.bt_datalen, bcm5974_irq_button, dev, 1); + dev->bt_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; + } + usb_fill_int_urb(dev->tp_urb, udev, usb_rcvintpipe(udev, cfg->tp_ep), dev->tp_data, dev->cfg.tp_datalen, bcm5974_irq_trackpad, dev, 1); + dev->tp_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; + /* create bcm5974 device */ usb_make_path(udev, dev->phys, sizeof(dev->phys)); strlcat(dev->phys, "/input0", sizeof(dev->phys)); diff --git a/drivers/input/mouse/pxa930_trkball.c b/drivers/input/mouse/pxa930_trkball.c index 3332b77eef2a..f04ba12dbfa8 100644 --- a/drivers/input/mouse/pxa930_trkball.c +++ b/drivers/input/mouse/pxa930_trkball.c @@ -15,7 +15,6 @@ #include <linux/io.h> #include <linux/slab.h> -#include <mach/hardware.h> #include <linux/platform_data/mouse-pxa930_trkball.h> /* Trackball Controller Register Definitions */ |