diff options
| author | Jaroslav Kysela <perex@suse.cz> | 2006-02-01 07:08:56 -0500 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-02-01 07:08:56 -0500 |
| commit | 847b9d01474f710e7a018186917d05e59e258309 (patch) | |
| tree | c0da8777ce350c4b048aa6ed2c41fdd109c42e92 /drivers/usb/input/touchkitusb.c | |
| parent | d1d051b28e9d3c3bed0bd15a2b49df3d04f7768f (diff) | |
| parent | a6df590dd8b7644c8e298e3b13442bcd6ceeb739 (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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); |