usb patches added

4 files changed, 165 insertions, 0 deletions

diff --git a/usb/usb-fix-ehci-early-handoff-issues-warning.patch b/usb/usb-fix-ehci-early-handoff-issues-warning.patch
new file mode 100644
index 00000000000000..a97080b82915a5
--- /dev/null
+++ b/usb/usb-fix-ehci-early-handoff-issues-warning.patch
@@ -0,0 +1,28 @@
+From akpm@osdl.org Tue Jan 24 17:42:44 2006
+Message-Id: <200601250142.k0P1gfXO031519@shell0.pdx.osdl.net>
+From: Andrew Morton <akpm@osdl.org>
+Subject: USB: fix ehci early handoff issues warning
+To: akpm@osdl.org, david-b@pacbell.net, greg@kroah.com
+From: akpm@osdl.org
+Date: Tue, 24 Jan 2006 17:42:24 -0800
+
+
+From: Andrew Morton <akpm@osdl.org>
+
+Cc: David Brownell <david-b@pacbell.net>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+---
+ drivers/usb/host/ehci-pci.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- gregkh-2.6.orig/drivers/usb/host/ehci-pci.c
++++ gregkh-2.6/drivers/usb/host/ehci-pci.c
+@@ -29,7 +29,6 @@ static int ehci_pci_reinit(struct ehci_h
+ {
+ 	u32			temp;
+ 	int			retval;
+-	unsigned		count = 256/4;
+ 
+ 	/* optional debug port, normally in the first BAR */
+ 	temp = pci_find_capability(pdev, 0x0a);
diff --git a/usb/usb-hid-add-blacklist-entry-for-hp-keyboard.patch b/usb/usb-hid-add-blacklist-entry-for-hp-keyboard.patch
new file mode 100644
index 00000000000000..a461f4eaf079bb
--- /dev/null
+++ b/usb/usb-hid-add-blacklist-entry-for-hp-keyboard.patch
@@ -0,0 +1,55 @@
+From vojtech@suse.cz Wed Jan 25 22:44:04 2006
+Date: Thu, 26 Jan 2006 07:44:31 +0100
+From: Vojtech Pavlik <vojtech@suse.cz>
+To: Alan Stern <stern@rowland.harvard.edu>
+Cc: Greg KH <greg@kroah.com>, <Johannes.Deisenhofer@tomorrow-focus.de>, Pete Zaitcev <zaitcev@redhat.com>,
+Subject: USB HID: add blacklist entry for HP keyboard
+Message-ID: <20060126064431.GA6764@suse.cz>
+Content-Disposition: inline
+
+My earlier experiment (adding a clear-halt for the interrupt-in
+endpoint)  failed.  It turns out that it does cause problems for other
+devices.  And it wasn't needed anyway; a simple blacklist entry was
+enough to get my HP keyboard working.
+
+This patch (as643) removes the clear-halt call and adds the blacklist
+entry.
+
+Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
+Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/input/hid-core.c |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+--- gregkh-2.6.orig/drivers/usb/input/hid-core.c
++++ gregkh-2.6/drivers/usb/input/hid-core.c
+@@ -1445,6 +1445,9 @@ void hid_init_reports(struct hid_device 
+ #define USB_VENDOR_ID_CHERRY		0x046a
+ #define USB_DEVICE_ID_CHERRY_CYMOTION	0x0023
+ 
++#define USB_VENDOR_ID_HP		0x03f0
++#define USB_DEVICE_ID_HP_USBHUB_KB	0x020c
++
+ /*
+  * Alphabetically sorted blacklist by quirk type.
+  */
+@@ -1558,6 +1561,7 @@ static const struct hid_blacklist {
+ 	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVMC, HID_QUIRK_NOGET },
+ 	{ USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_KEYBOARD, HID_QUIRK_NOGET},
+ 	{ USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_USBHUB_KB, HID_QUIRK_NOGET},
++	{ USB_VENDOR_ID_HP, USB_DEVICE_ID_HP_USBHUB_KB, HID_QUIRK_NOGET },
+ 	{ USB_VENDOR_ID_TANGTOP, USB_DEVICE_ID_TANGTOP_USBPS2, HID_QUIRK_NOGET },
+ 
+ 	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_POWERMOUSE, HID_QUIRK_2WHEEL_POWERMOUSE },
+@@ -1820,9 +1824,6 @@ static struct hid_device *usb_hid_config
+ 	hid->urbctrl->transfer_dma = hid->ctrlbuf_dma;
+ 	hid->urbctrl->transfer_flags |= (URB_NO_TRANSFER_DMA_MAP | URB_NO_SETUP_DMA_MAP);
+ 
+-	/* May be needed for some devices */
+-	usb_clear_halt(hid->dev, hid->urbin->pipe);
+-
+ 	return hid;
+ 
+ fail:
diff --git a/usb/usb-usbip-warning-fixes.patch b/usb/usb-usbip-warning-fixes.patch
new file mode 100644
index 00000000000000..e6cf05290d8ca8
--- /dev/null
+++ b/usb/usb-usbip-warning-fixes.patch
@@ -0,0 +1,48 @@
+From akpm@osdl.org Thu Jan 19 23:59:29 2006
+Message-Id: <200601200759.k0K7xPcm020721@shell0.pdx.osdl.net>
+Subject: [patch 1/2] usb: usbip warning fixes
+To: greg@kroah.com
+Cc: akpm@osdl.org
+From: akpm@osdl.org
+Date: Thu, 19 Jan 2006 23:59:11 -0800
+
+
+From: Andrew Morton <akpm@osdl.org>
+
+drivers/usb/ip/stub_tx.c: In function `stub_send_txdata':
+drivers/usb/ip/stub_tx.c:158: warning: int format, different type arg (arg 7)
+drivers/usb/ip/vhci_tx.c: In function `vhci_send_txdata':
+drivers/usb/ip/vhci_tx.c:137: warning: int format, different type arg (arg 7)
+
+
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+---
+ drivers/usb/ip/stub_tx.c |    3 ++-
+ drivers/usb/ip/vhci_tx.c |    3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+--- gregkh-2.6.orig/drivers/usb/ip/stub_tx.c
++++ gregkh-2.6/drivers/usb/ip/stub_tx.c
+@@ -155,7 +155,8 @@ static int stub_send_txdata(struct stub_
+ 		int ret;
+ 		ret = usbip_sendmsg(sdev->ud.tcp_socket, &msg, txsize);
+ 		if (ret != txsize) {
+-			VHCI_ERROR("vhci_sendmsg failed!, retval %d for %d\n", ret, txsize);
++			VHCI_ERROR("vhci_sendmsg failed!, retval %d for %zd\n",
++					ret, txsize);
+ 			usbip_event_add(&sdev->ud, SDEV_EVENT_ERROR_TCP);
+ 			return -1;
+ 		}
+--- gregkh-2.6.orig/drivers/usb/ip/vhci_tx.c
++++ gregkh-2.6/drivers/usb/ip/vhci_tx.c
+@@ -134,7 +134,8 @@ static int vhci_send_txdata(struct vhci_
+ 		int ret;
+ 		ret = usbip_sendmsg(vdev->ud.tcp_socket, &msg, txsize);
+ 		if (ret != txsize) {
+-			VHCI_ERROR("vhci_sendmsg failed!, retval %d for %d\n", ret, txsize);
++			VHCI_ERROR("vhci_sendmsg failed!, retval %d for %zd\n",
++					ret, txsize);
+ 			usbip_event_add(&vdev->ud, VDEV_EVENT_ERROR_TCP);
+ 			return -1;
+ 		}
diff --git a/usb/usb-yealink-printk-warning-fix.patch b/usb/usb-yealink-printk-warning-fix.patch
new file mode 100644
index 00000000000000..17702e2dfaa2e0
--- /dev/null
+++ b/usb/usb-yealink-printk-warning-fix.patch
@@ -0,0 +1,34 @@
+From akpm@osdl.org Thu Jan 19 23:59:29 2006
+Message-Id: <200601200759.k0K7xQni020724@shell0.pdx.osdl.net>
+From: Andrew Morton <akpm@osdl.org>
+Subject: USB: yealink printk warning fix
+To: greg@kroah.com
+Cc: akpm@osdl.org
+From: akpm@osdl.org
+Date: Thu, 19 Jan 2006 23:59:12 -0800
+
+
+From: Andrew Morton <akpm@osdl.org>
+
+drivers/usb/input/yealink.c: In function `usb_probe':
+drivers/usb/input/yealink.c:910: warning: int format, different type arg (arg 4)
+
+
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/input/yealink.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- gregkh-2.6.orig/drivers/usb/input/yealink.c
++++ gregkh-2.6/drivers/usb/input/yealink.c
+@@ -907,7 +907,7 @@ static int usb_probe(struct usb_interfac
+ 	pipe = usb_rcvintpipe(udev, endpoint->bEndpointAddress);
+ 	ret = usb_maxpacket(udev, pipe, usb_pipeout(pipe));
+ 	if (ret != USB_PKT_LEN)
+-		err("invalid payload size %d, expected %d", ret, USB_PKT_LEN);
++		err("invalid payload size %d, expected %zd", ret, USB_PKT_LEN);
+ 
+ 	/* initialise irq urb */
+ 	usb_fill_int_urb(yld->urb_irq, udev, pipe, yld->irq_data,