Skip to content

Commit 9886142

Browse files
committed
Merge tag 'input-for-v5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov: - proper annotation of USB buffers in bcm5974 touchpad dirver - a quirk in SOC button driver to handle Lenovo Yoga Tablet2 1051F - a fix for missing dependency in raspberrypi-ts driver to avoid compile breakages with random configs. * tag 'input-for-v5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: soc_button_array - also add Lenovo Yoga Tablet2 1051F to dmi_use_low_level_irq Input: bcm5974 - set missing URB_NO_TRANSFER_DMA_MAP urb flag Input: raspberrypi-ts - add missing HAS_IOMEM dependency
2 parents f7a447e + 6ab2e51 commit 9886142

3 files changed

Lines changed: 9 additions & 3 deletions

File tree

drivers/input/joystick/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,7 @@ config JOYSTICK_N64
402402
config JOYSTICK_SENSEHAT
403403
tristate "Raspberry Pi Sense HAT joystick"
404404
depends on INPUT && I2C
405+
depends on HAS_IOMEM
405406
select MFD_SIMPLE_MFD_I2C
406407
help
407408
Say Y here if you want to enable the driver for the

drivers/input/misc/soc_button_array.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,13 @@ static const struct dmi_system_id dmi_use_low_level_irq[] = {
8585
},
8686
{
8787
/*
88-
* Lenovo Yoga Tab2 1051L, something messes with the home-button
88+
* Lenovo Yoga Tab2 1051F/1051L, something messes with the home-button
8989
* IRQ settings, leading to a non working home-button.
9090
*/
9191
.matches = {
9292
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
9393
DMI_MATCH(DMI_PRODUCT_NAME, "60073"),
94-
DMI_MATCH(DMI_PRODUCT_VERSION, "1051L"),
94+
DMI_MATCH(DMI_PRODUCT_VERSION, "1051"),
9595
},
9696
},
9797
{} /* Terminating entry */

drivers/input/mouse/bcm5974.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -942,17 +942,22 @@ static int bcm5974_probe(struct usb_interface *iface,
942942
if (!dev->tp_data)
943943
goto err_free_bt_buffer;
944944

945-
if (dev->bt_urb)
945+
if (dev->bt_urb) {
946946
usb_fill_int_urb(dev->bt_urb, udev,
947947
usb_rcvintpipe(udev, cfg->bt_ep),
948948
dev->bt_data, dev->cfg.bt_datalen,
949949
bcm5974_irq_button, dev, 1);
950950

951+
dev->bt_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
952+
}
953+
951954
usb_fill_int_urb(dev->tp_urb, udev,
952955
usb_rcvintpipe(udev, cfg->tp_ep),
953956
dev->tp_data, dev->cfg.tp_datalen,
954957
bcm5974_irq_trackpad, dev, 1);
955958

959+
dev->tp_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
960+
956961
/* create bcm5974 device */
957962
usb_make_path(udev, dev->phys, sizeof(dev->phys));
958963
strlcat(dev->phys, "/input0", sizeof(dev->phys));

0 commit comments

Comments
 (0)