diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
| commit | 9caafa6c8686e319cf4d5f3757b3972c6c522b7c (patch) | |
| tree | b38979b835b5d22e681b175d0b98a3c7560d9c59 /drivers/usb/input/touchkitusb.c | |
| parent | 51e9f2ff83df6b1c81c5c44f4486c68ed87aa20e (diff) | |
| parent | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/usb/input/touchkitusb.c')
| -rw-r--r-- | drivers/usb/input/touchkitusb.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/input/touchkitusb.c b/drivers/usb/input/touchkitusb.c index 3b3c7b4120a2..697c5e573a11 100644 --- a/drivers/usb/input/touchkitusb.c +++ b/drivers/usb/input/touchkitusb.c | |||
| @@ -337,6 +337,9 @@ static int touchkit_probe(struct usb_interface *intf, | |||
| 337 | touchkit->data, TOUCHKIT_REPORT_DATA_SIZE, | 337 | touchkit->data, TOUCHKIT_REPORT_DATA_SIZE, |
| 338 | touchkit_irq, touchkit, endpoint->bInterval); | 338 | touchkit_irq, touchkit, endpoint->bInterval); |
| 339 | 339 | ||
| 340 | touchkit->irq->transfer_dma = touchkit->data_dma; | ||
| 341 | touchkit->irq->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; | ||
| 342 | |||
| 340 | input_register_device(touchkit->input); | 343 | input_register_device(touchkit->input); |
| 341 | 344 | ||
| 342 | usb_set_intfdata(intf, touchkit); | 345 | usb_set_intfdata(intf, touchkit); |
