usbtouchscreen: don't send interrupt urbs to bulk endpoints
Subsystems (2)
PATCH 6/7 usbtouchscreen: don't send interrupt urbs to bulk endpoints
From: Ondrej Zary <[email protected]>
Don't send interrupt urbs to bulk endpoints.
This fixes EHCI corruption after rmmod with NEXIO touchscreen.
Signed-off-by Ondrej Zary <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc Jim Persson <[email protected]>
Cc Florian Echtler <[email protected]>
Cc Dan Streetman <[email protected]>
Cc Daniel Ritz <[email protected]>
Cc Greg KH <[email protected]>
Cc Oliver Neukum <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/input/touchscreen/usbtouchscreen.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/input/touchscreen/usbtouchscreen.c renamed from drivers/input/touchscreen/usbtouchscreen.c~usbtouchscreen-dont-send-interrupt-urbs-to-bulk-endpoints +7 -1
@@ -1375,10 +1375,16 @@ static int usbtouch_probe(struct usb_intinput_set_abs_params (input_dev,ABS_PRESSURE , type->min_press, type->max_press,0 ,0 ); -usb_fill_int_urb (usbtouch->irq, udev, +if (usb_endpoint_type (endpoint) ==USB_ENDPOINT_XFER_INT ) +usb_fill_int_urb (usbtouch->irq, udev,usb_rcvintpipe (udev, endpoint->bEndpointAddress), usbtouch->data, type->rept_size, usbtouch_irq, usbtouch, endpoint->bInterval); +else +usb_fill_bulk_urb (usbtouch->irq, udev, +usb_rcvbulkpipe (udev, endpoint->bEndpointAddress), + usbtouch->data, type->rept_size, + usbtouch_irq, usbtouch); usbtouch->irq->dev = udev; usbtouch->irq->transfer_dma = usbtouch->data_dma;
_