Skip to content

Commit c42e656

Browse files
matnymandtor
authored andcommitted
Input: bcm5974 - set missing URB_NO_TRANSFER_DMA_MAP urb flag
The bcm5974 driver does the allocation and dma mapping of the usb urb data buffer, but driver does not set the URB_NO_TRANSFER_DMA_MAP flag to let usb core know the buffer is already mapped. usb core tries to map the already mapped buffer, causing a warning: "xhci_hcd 0000:00:14.0: rejecting DMA map of vmalloc memory" Fix this by setting the URB_NO_TRANSFER_DMA_MAP, letting usb core know buffer is already mapped by bcm5974 driver Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> Cc: stable@vger.kernel.org Link: https://bugzilla.kernel.org/show_bug.cgi?id=215890 Link: https://lore.kernel.org/r/20220606113636.588955-1-mathias.nyman@linux.intel.com Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
1 parent 5f92df8 commit c42e656

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

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)