Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

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,
                          touchkit->data, TOUCHKIT_REPORT_DATA_SIZE,
                          touchkit_irq, touchkit, endpoint->bInterval);
 
+        touchkit->irq->transfer_dma = touchkit->data_dma;
+        touchkit->irq->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
+
         input_register_device(touchkit->input);
 
         usb_set_intfdata(intf, touchkit);