From: Dmitry Torokhov <dtor_core@ameritech.net>
Date: Sat, 10 Sep 2005 01:14:47 +0000 (-0500)
Subject: Manual merge with Linus
X-Git-Tag: v2.6.14-rc1~128^2~2
X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=d344c5e0856ad03278d8700b503762dbc8b86e12;p=linux-2.6-omap-h63xx.git

Manual merge with Linus
---

d344c5e0856ad03278d8700b503762dbc8b86e12
diff --cc drivers/usb/input/hid-core.c
index a7212990045,1ab95d24c5e..e108e0a36b7
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
@@@ -1432,7 -1432,7 +1432,7 @@@ void hid_init_reports(struct hid_devic
  #define USB_DEVICE_ID_VERNIER_CYCLOPS	0x0004
  
  #define USB_VENDOR_ID_LD		0x0f11
--#define USB_DEVICE_ID_CASSY        	0x1000
++#define USB_DEVICE_ID_CASSY		0x1000
  #define USB_DEVICE_ID_POCKETCASSY	0x1010
  #define USB_DEVICE_ID_MOBILECASSY	0x1020
  #define USB_DEVICE_ID_JWM		0x1080
@@@ -1445,7 -1445,7 +1445,8 @@@
  #define USB_DEVICE_ID_POWERCONTROL	0x2030
  
  #define USB_VENDOR_ID_APPLE		0x05ac
 -#define USB_DEVICE_ID_APPLE_BLUETOOTH  	0x1000
 +#define USB_DEVICE_ID_APPLE_POWERMOUSE	0x0304
++#define USB_DEVICE_ID_APPLE_BLUETOOTH	0x1000
  
  /*
   * Alphabetically sorted blacklist by quirk type.
@@@ -1717,10 -1685,10 +1719,10 @@@ static struct hid_device *usb_hid_confi
  			if (!(hid->urbin = usb_alloc_urb(0, GFP_KERNEL)))
  				goto fail;
  			pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
 -			usb_fill_int_urb(hid->urbin, dev, pipe, hid->inbuf, 0,
 +			usb_fill_int_urb(hid->urbin, dev, pipe, hid->inbuf, insize,
  					 hid_irq_in, hid, interval);
  			hid->urbin->transfer_dma = hid->inbuf_dma;
- 			hid->urbin->transfer_flags |=(URB_NO_TRANSFER_DMA_MAP | URB_ASYNC_UNLINK);
+ 			hid->urbin->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
  		} else {
  			if (hid->urbout)
  				continue;