diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-07-03 11:09:09 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-07-03 11:09:09 -0700 |
commit | edebd83392a7b67e4b4aa1a3d387f0593d07f053 (patch) | |
tree | 15ba4110301eff54b33437e6dad58d2d71e632f6 /usb | |
parent | 4f380d9c1d1c3e77a996c2dfaa09daebdce6b257 (diff) | |
download | patches-edebd83392a7b67e4b4aa1a3d387f0593d07f053.tar.gz |
2.6.17-git21 refresh
Diffstat (limited to 'usb')
30 files changed, 124 insertions, 124 deletions
diff --git a/usb/always-announce-new-usb-devices.patch b/usb/always-announce-new-usb-devices.patch index 92c215956b3f32..cb4c17c76dc578 100644 --- a/usb/always-announce-new-usb-devices.patch +++ b/usb/always-announce-new-usb-devices.patch @@ -14,7 +14,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/usb/core/hub.c +++ gregkh-2.6/drivers/usb/core/hub.c -@@ -1289,7 +1289,6 @@ static int choose_configuration(struct u +@@ -1288,7 +1288,6 @@ static int choose_configuration(struct u return i; } @@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static void show_string(struct usb_device *udev, char *id, char *string) { if (!string) -@@ -1297,10 +1296,6 @@ static void show_string(struct usb_devic +@@ -1296,10 +1295,6 @@ static void show_string(struct usb_devic dev_printk(KERN_INFO, &udev->dev, "%s: %s\n", id, string); } @@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #ifdef CONFIG_USB_OTG -@@ -1345,7 +1340,10 @@ int usb_new_device(struct usb_device *ud +@@ -1344,7 +1339,10 @@ int usb_new_device(struct usb_device *ud udev->serial = usb_cache_string(udev, udev->descriptor.iSerialNumber); /* Tell the world! */ diff --git a/usb/usb-addition-of-vendor-product-id-pair-for-pl2303-driver.patch b/usb/usb-addition-of-vendor-product-id-pair-for-pl2303-driver.patch index 50d9358c4b1d1c..5799bd5baeca17 100644 --- a/usb/usb-addition-of-vendor-product-id-pair-for-pl2303-driver.patch +++ b/usb/usb-addition-of-vendor-product-id-pair-for-pl2303-driver.patch @@ -46,7 +46,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Kroah-Hartman at greg@kroah.com --- gregkh-2.6.orig/drivers/usb/serial/pl2303.c +++ gregkh-2.6/drivers/usb/serial/pl2303.c -@@ -53,6 +53,7 @@ struct pl2303_buf { +@@ -52,6 +52,7 @@ struct pl2303_buf { static struct usb_device_id id_table [] = { { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID) }, { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_RSAQ2) }, diff --git a/usb/usb-allow-compile-in-g_ether-fix-typo.patch b/usb/usb-allow-compile-in-g_ether-fix-typo.patch index 023fb1713c5903..462b73a46dc19e 100644 --- a/usb/usb-allow-compile-in-g_ether-fix-typo.patch +++ b/usb/usb-allow-compile-in-g_ether-fix-typo.patch @@ -20,7 +20,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/usb/gadget/ether.c +++ gregkh-2.6/drivers/usb/gadget/ether.c -@@ -261,7 +261,7 @@ MODULE_PARM_DESC(host_addr, "Host Ethern +@@ -260,7 +260,7 @@ MODULE_PARM_DESC(host_addr, "Host Ethern #define DEV_CONFIG_CDC #endif @@ -29,7 +29,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define DEV_CONFIG_CDC #endif -@@ -2548,7 +2548,7 @@ static struct usb_gadget_driver eth_driv +@@ -2547,7 +2547,7 @@ static struct usb_gadget_driver eth_driv .function = (char *) driver_desc, .bind = eth_bind, diff --git a/usb/usb-at91-ohci-updates-mostly-power-management.patch b/usb/usb-at91-ohci-updates-mostly-power-management.patch index 9d8b0efb3ad0be..a499ae1a0e87e4 100644 --- a/usb/usb-at91-ohci-updates-mostly-power-management.patch +++ b/usb/usb-at91-ohci-updates-mostly-power-management.patch @@ -280,7 +280,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> }; --- gregkh-2.6.orig/drivers/usb/host/ohci-hcd.c +++ gregkh-2.6/drivers/usb/host/ohci-hcd.c -@@ -924,7 +924,7 @@ MODULE_LICENSE ("GPL"); +@@ -923,7 +923,7 @@ MODULE_LICENSE ("GPL"); #include "ohci-ppc-soc.c" #endif @@ -289,7 +289,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #include "ohci-at91.c" #endif -@@ -938,6 +938,7 @@ MODULE_LICENSE ("GPL"); +@@ -937,6 +937,7 @@ MODULE_LICENSE ("GPL"); || defined (CONFIG_SOC_AU1X00) \ || defined (CONFIG_USB_OHCI_HCD_PPC_SOC) \ || defined (CONFIG_ARCH_AT91RM9200) \ diff --git a/usb/usb-at91-udc-updates-mostly-power-management.patch b/usb/usb-at91-udc-updates-mostly-power-management.patch index 1d0a3bc25adc48..f804ddf05ac399 100644 --- a/usb/usb-at91-udc-updates-mostly-power-management.patch +++ b/usb/usb-at91-udc-updates-mostly-power-management.patch @@ -32,7 +32,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/usb/gadget/at91_udc.c +++ gregkh-2.6/drivers/usb/gadget/at91_udc.c -@@ -70,7 +70,7 @@ +@@ -69,7 +69,7 @@ * power. During USB suspend, the 48 MHz clock is gated off. */ @@ -41,7 +41,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static const char driver_name [] = "at91_udc"; static const char ep0name[] = "ep0"; -@@ -319,7 +319,8 @@ static void done(struct at91_ep *ep, str +@@ -318,7 +318,8 @@ static void done(struct at91_ep *ep, str * that shouldn't normally be changed. */ #define SET_FX (AT91_UDP_TXPKTRDY) @@ -51,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* pull OUT packet data from the endpoint's fifo */ static int read_fifo (struct at91_ep *ep, struct at91_request *req) -@@ -473,7 +474,8 @@ static void nuke(struct at91_ep *ep, int +@@ -472,7 +473,8 @@ static void nuke(struct at91_ep *ep, int /*-------------------------------------------------------------------------*/ @@ -61,7 +61,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { struct at91_ep *ep = container_of(_ep, struct at91_ep, ep); struct at91_udc *dev = ep->udc; -@@ -583,11 +585,12 @@ static int at91_ep_disable (struct usb_e +@@ -582,11 +584,12 @@ static int at91_ep_disable (struct usb_e * interesting for request or buffer allocation. */ @@ -76,7 +76,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (!req) return NULL; -@@ -890,8 +893,8 @@ static void clk_off(struct at91_udc *udc +@@ -889,8 +892,8 @@ static void clk_off(struct at91_udc *udc return; udc->clocked = 0; udc->gadget.speed = USB_SPEED_UNKNOWN; @@ -86,7 +86,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /* -@@ -912,9 +915,6 @@ static void pullup(struct at91_udc *udc, +@@ -911,9 +914,6 @@ static void pullup(struct at91_udc *udc, at91_udp_write(AT91_UDP_TXVC, AT91_UDP_TXVC_TXVDIS); at91_set_gpio_value(udc->board.pullup_pin, 0); clk_off(udc); @@ -96,7 +96,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } } -@@ -1291,7 +1291,8 @@ static void handle_ep0(struct at91_udc * +@@ -1290,7 +1290,8 @@ static void handle_ep0(struct at91_udc * if (udc->wait_for_addr_ack) { u32 tmp; @@ -106,7 +106,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> tmp = at91_udp_read(AT91_UDP_GLB_STAT); tmp &= ~AT91_UDP_FADDEN; if (udc->addr) -@@ -1362,9 +1363,10 @@ static irqreturn_t at91_udc_irq (int irq +@@ -1361,9 +1362,10 @@ static irqreturn_t at91_udc_irq (int irq u32 rescans = 5; while (rescans--) { @@ -119,7 +119,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (!status) break; -@@ -1380,18 +1382,17 @@ static irqreturn_t at91_udc_irq (int irq +@@ -1379,18 +1381,17 @@ static irqreturn_t at91_udc_irq (int irq stop_activity(udc); /* enable ep0 */ @@ -143,7 +143,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> */ /* host initiated suspend (3+ms bus idle) */ -@@ -1453,13 +1454,19 @@ static irqreturn_t at91_udc_irq (int irq +@@ -1452,13 +1453,19 @@ static irqreturn_t at91_udc_irq (int irq /*-------------------------------------------------------------------------*/ @@ -168,7 +168,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } }, .ep[0] = { -@@ -1469,7 +1476,8 @@ static struct at91_udc controller = { +@@ -1468,7 +1475,8 @@ static struct at91_udc controller = { }, .udc = &controller, .maxpacket = 8, @@ -178,7 +178,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> .int_mask = 1 << 0, }, .ep[1] = { -@@ -1480,7 +1488,8 @@ static struct at91_udc controller = { +@@ -1479,7 +1487,8 @@ static struct at91_udc controller = { .udc = &controller, .is_pingpong = 1, .maxpacket = 64, @@ -188,7 +188,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> .int_mask = 1 << 1, }, .ep[2] = { -@@ -1491,7 +1500,8 @@ static struct at91_udc controller = { +@@ -1490,7 +1499,8 @@ static struct at91_udc controller = { .udc = &controller, .is_pingpong = 1, .maxpacket = 64, @@ -198,7 +198,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> .int_mask = 1 << 2, }, .ep[3] = { -@@ -1502,7 +1512,8 @@ static struct at91_udc controller = { +@@ -1501,7 +1511,8 @@ static struct at91_udc controller = { }, .udc = &controller, .maxpacket = 8, @@ -208,7 +208,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> .int_mask = 1 << 3, }, .ep[4] = { -@@ -1513,7 +1524,8 @@ static struct at91_udc controller = { +@@ -1512,7 +1523,8 @@ static struct at91_udc controller = { .udc = &controller, .is_pingpong = 1, .maxpacket = 256, @@ -218,7 +218,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> .int_mask = 1 << 4, }, .ep[5] = { -@@ -1524,10 +1536,11 @@ static struct at91_udc controller = { +@@ -1523,10 +1535,11 @@ static struct at91_udc controller = { .udc = &controller, .is_pingpong = 1, .maxpacket = 256, @@ -232,7 +232,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> }; static irqreturn_t at91_vbus_irq(int irq, void *_udc, struct pt_regs *r) -@@ -1625,6 +1638,16 @@ static int __devinit at91udc_probe(struc +@@ -1624,6 +1637,16 @@ static int __devinit at91udc_probe(struc return -ENODEV; } @@ -249,7 +249,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (!request_mem_region(AT91_BASE_UDP, SZ_16K, driver_name)) { DBG("someone's using UDC memory\n"); return -EBUSY; -@@ -1650,19 +1673,26 @@ static int __devinit at91udc_probe(struc +@@ -1649,19 +1672,26 @@ static int __devinit at91udc_probe(struc if (retval < 0) goto fail0; @@ -262,28 +262,28 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + clk_disable(udc->iclk); /* request UDC and maybe VBUS irqs */ -- if (request_irq(AT91_ID_UDP, at91_udc_irq, SA_INTERRUPT, driver_name, udc)) { +- if (request_irq(AT91_ID_UDP, at91_udc_irq, IRQF_DISABLED, driver_name, udc)) { - DBG("request irq %d failed\n", AT91_ID_UDP); + udc->udp_irq = platform_get_irq(pdev, 0); + if (request_irq(udc->udp_irq, at91_udc_irq, -+ SA_INTERRUPT, driver_name, udc)) { ++ IRQF_DISABLED, driver_name, udc)) { + DBG("request irq %d failed\n", udc->udp_irq); retval = -EBUSY; goto fail1; } if (udc->board.vbus_pin > 0) { -- if (request_irq(udc->board.vbus_pin, at91_vbus_irq, SA_INTERRUPT, driver_name, udc)) { +- if (request_irq(udc->board.vbus_pin, at91_vbus_irq, IRQF_DISABLED, driver_name, udc)) { - DBG("request vbus irq %d failed\n", udc->board.vbus_pin); - free_irq(AT91_ID_UDP, udc); + if (request_irq(udc->board.vbus_pin, at91_vbus_irq, -+ SA_INTERRUPT, driver_name, udc)) { ++ IRQF_DISABLED, driver_name, udc)) { + DBG("request vbus irq %d failed\n", + udc->board.vbus_pin); + free_irq(udc->udp_irq, udc); retval = -EBUSY; goto fail1; } -@@ -1671,6 +1701,7 @@ static int __devinit at91udc_probe(struc +@@ -1670,6 +1700,7 @@ static int __devinit at91udc_probe(struc udc->vbus = 1; } dev_set_drvdata(dev, udc); @@ -291,7 +291,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> create_debug_file(udc); INFO("%s version %s\n", driver_name, DRIVER_VERSION); -@@ -1679,14 +1710,14 @@ static int __devinit at91udc_probe(struc +@@ -1678,14 +1709,14 @@ static int __devinit at91udc_probe(struc fail1: device_unregister(&udc->gadget.dev); fail0: @@ -309,7 +309,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> DBG("remove\n"); -@@ -1695,10 +1726,11 @@ static int __devexit at91udc_remove(stru +@@ -1694,10 +1725,11 @@ static int __devexit at91udc_remove(stru if (udc->driver != 0) usb_gadget_unregister_driver(udc->driver); @@ -322,7 +322,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> device_unregister(&udc->gadget.dev); release_mem_region(AT91_BASE_UDP, SZ_16K); -@@ -1709,31 +1741,36 @@ static int __devexit at91udc_remove(stru +@@ -1708,31 +1740,36 @@ static int __devexit at91udc_remove(stru } #ifdef CONFIG_PM @@ -376,7 +376,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* maybe reconnect to host; if so, clocks on */ pullup(udc, 1); -@@ -1749,7 +1786,7 @@ static struct platform_driver at91_udc = +@@ -1748,7 +1785,7 @@ static struct platform_driver at91_udc = .remove = __devexit_p(at91udc_remove), .shutdown = at91udc_shutdown, .suspend = at91udc_suspend, @@ -385,7 +385,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> .driver = { .name = (char *) driver_name, .owner = THIS_MODULE, -@@ -1768,6 +1805,6 @@ static void __devexit udc_exit_module(vo +@@ -1767,6 +1804,6 @@ static void __devexit udc_exit_module(vo } module_exit(udc_exit_module); diff --git a/usb/usb-ehci-fix-bogus-alteration-of-a-local-variable.patch b/usb/usb-ehci-fix-bogus-alteration-of-a-local-variable.patch index 8d6db804fccdd2..98a62f947f79d9 100644 --- a/usb/usb-ehci-fix-bogus-alteration-of-a-local-variable.patch +++ b/usb/usb-ehci-fix-bogus-alteration-of-a-local-variable.patch @@ -29,7 +29,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/usb/host/ehci-hcd.c +++ gregkh-2.6/drivers/usb/host/ehci-hcd.c -@@ -626,10 +626,11 @@ static irqreturn_t ehci_irq (struct usb_ +@@ -625,10 +625,11 @@ static irqreturn_t ehci_irq (struct usb_ writel (status | CMD_RUN, &ehci->regs->command); while (i--) { diff --git a/usb/usb-fix-usb-serial-leaks-oopses-on-disconnect.patch b/usb/usb-fix-usb-serial-leaks-oopses-on-disconnect.patch index 52d6465013f77b..f9ee0052994bdc 100644 --- a/usb/usb-fix-usb-serial-leaks-oopses-on-disconnect.patch +++ b/usb/usb-fix-usb-serial-leaks-oopses-on-disconnect.patch @@ -20,7 +20,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/usb/serial/usb-serial.c +++ gregkh-2.6/drivers/usb/serial/usb-serial.c -@@ -41,6 +41,8 @@ +@@ -40,6 +40,8 @@ #define DRIVER_AUTHOR "Greg Kroah-Hartman, greg@kroah.com, http://www.kroah.com/linux/" #define DRIVER_DESC "USB Serial Driver core" @@ -29,7 +29,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Driver structure we register with the USB core */ static struct usb_driver usb_serial_driver = { .name = "usbserial", -@@ -147,23 +149,10 @@ static void destroy_serial(struct kref * +@@ -146,23 +148,10 @@ static void destroy_serial(struct kref * port = serial->port[i]; if (!port) continue; @@ -54,7 +54,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> usb_put_dev(serial->dev); /* free up any memory that we allocated */ -@@ -565,6 +554,11 @@ static void port_release(struct device * +@@ -564,6 +553,11 @@ static void port_release(struct device * struct usb_serial_port *port = to_usb_serial_port(dev); dbg ("%s - %s", __FUNCTION__, dev->bus_id); @@ -66,7 +66,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> usb_kill_urb(port->read_urb); usb_free_urb(port->read_urb); usb_kill_urb(port->write_urb); -@@ -577,6 +571,7 @@ static void port_release(struct device * +@@ -576,6 +570,7 @@ static void port_release(struct device * kfree(port->bulk_out_buffer); kfree(port->interrupt_in_buffer); kfree(port->interrupt_out_buffer); diff --git a/usb/usb-fix-visor-leaks.patch b/usb/usb-fix-visor-leaks.patch index b20ab901386866..e427526603284d 100644 --- a/usb/usb-fix-visor-leaks.patch +++ b/usb/usb-fix-visor-leaks.patch @@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/usb/serial/visor.c +++ gregkh-2.6/drivers/usb/serial/visor.c -@@ -436,13 +436,25 @@ static int visor_write (struct usb_seria +@@ -435,13 +435,25 @@ static int visor_write (struct usb_seria static int visor_write_room (struct usb_serial_port *port) { @@ -49,7 +49,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return 2048; } -@@ -759,15 +771,22 @@ static int visor_calc_num_ports (struct +@@ -758,15 +770,22 @@ static int visor_calc_num_ports (struct static int generic_startup(struct usb_serial *serial) { @@ -74,7 +74,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } return 0; } -@@ -877,7 +896,18 @@ static int clie_5_attach (struct usb_ser +@@ -876,7 +895,18 @@ static int clie_5_attach (struct usb_ser static void visor_shutdown (struct usb_serial *serial) { diff --git a/usb/usb-hub-don-t-return-status-0-from-resume.patch b/usb/usb-hub-don-t-return-status-0-from-resume.patch index 54876894d44b6e..36e625fac9c156 100644 --- a/usb/usb-hub-don-t-return-status-0-from-resume.patch +++ b/usb/usb-hub-don-t-return-status-0-from-resume.patch @@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/usb/core/hub.c +++ gregkh-2.6/drivers/usb/core/hub.c -@@ -1791,7 +1791,10 @@ static int finish_device_resume(struct u +@@ -1790,7 +1790,10 @@ static int finish_device_resume(struct u * and device drivers will know about any resume quirks. */ status = usb_get_status(udev, USB_RECIP_DEVICE, 0, &devstatus); diff --git a/usb/usb-ipaq.c-bugfixes.patch b/usb/usb-ipaq.c-bugfixes.patch index bd0a6edb20fca8..69b70acba3f817 100644 --- a/usb/usb-ipaq.c-bugfixes.patch +++ b/usb/usb-ipaq.c-bugfixes.patch @@ -28,7 +28,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/usb/serial/ipaq.c +++ gregkh-2.6/drivers/usb/serial/ipaq.c -@@ -652,11 +652,6 @@ static int ipaq_open(struct usb_serial_p +@@ -651,11 +651,6 @@ static int ipaq_open(struct usb_serial_p usb_rcvbulkpipe(serial->dev, port->bulk_in_endpointAddress), port->read_urb->transfer_buffer, port->read_urb->transfer_buffer_length, ipaq_read_bulk_callback, port); @@ -40,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* * Send out control message observed in win98 sniffs. Not sure what -@@ -671,6 +666,11 @@ static int ipaq_open(struct usb_serial_p +@@ -670,6 +665,11 @@ static int ipaq_open(struct usb_serial_p usb_sndctrlpipe(serial->dev, 0), 0x22, 0x21, 0x1, 0, NULL, 0, 100); if (result == 0) { @@ -52,7 +52,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return 0; } } -@@ -855,6 +855,7 @@ static void ipaq_write_bulk_callback(str +@@ -854,6 +854,7 @@ static void ipaq_write_bulk_callback(str if (urb->status) { dbg("%s - nonzero write bulk status received: %d", __FUNCTION__, urb->status); diff --git a/usb/usb-ipaq.c-timing-parameters.patch b/usb/usb-ipaq.c-timing-parameters.patch index 2105e906c4146f..59e0d28ddd7dca 100644 --- a/usb/usb-ipaq.c-timing-parameters.patch +++ b/usb/usb-ipaq.c-timing-parameters.patch @@ -36,7 +36,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/usb/serial/ipaq.c +++ gregkh-2.6/drivers/usb/serial/ipaq.c -@@ -71,6 +71,8 @@ +@@ -70,6 +70,8 @@ static __u16 product, vendor; static int debug; @@ -45,7 +45,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Function prototypes for an ipaq */ static int ipaq_open (struct usb_serial_port *port, struct file *filp); -@@ -583,7 +585,7 @@ static int ipaq_open(struct usb_serial_p +@@ -582,7 +584,7 @@ static int ipaq_open(struct usb_serial_p struct ipaq_private *priv; struct ipaq_packet *pkt; int i, result = 0; @@ -54,7 +54,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dbg("%s - port %d", __FUNCTION__, port->number); -@@ -647,6 +649,7 @@ static int ipaq_open(struct usb_serial_p +@@ -646,6 +648,7 @@ static int ipaq_open(struct usb_serial_p port->read_urb->transfer_buffer_length = URBDATA_SIZE; port->bulk_out_size = port->write_urb->transfer_buffer_length = URBDATA_SIZE; @@ -62,7 +62,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Start reading from the device */ usb_fill_bulk_urb(port->read_urb, serial->dev, usb_rcvbulkpipe(serial->dev, port->bulk_in_endpointAddress), -@@ -673,6 +676,7 @@ static int ipaq_open(struct usb_serial_p +@@ -672,6 +675,7 @@ static int ipaq_open(struct usb_serial_p } return 0; } @@ -70,7 +70,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } err("%s - failed doing control urb, error %d", __FUNCTION__, result); goto error; -@@ -968,3 +972,9 @@ MODULE_PARM_DESC(vendor, "User specified +@@ -967,3 +971,9 @@ MODULE_PARM_DESC(vendor, "User specified module_param(product, ushort, 0); MODULE_PARM_DESC(product, "User specified USB idProduct"); diff --git a/usb/usb-kill-compiler-warning-in-quirk_usb_handoff_ohci.patch b/usb/usb-kill-compiler-warning-in-quirk_usb_handoff_ohci.patch index e290f4ce265f3e..18a88efac75da8 100644 --- a/usb/usb-kill-compiler-warning-in-quirk_usb_handoff_ohci.patch +++ b/usb/usb-kill-compiler-warning-in-quirk_usb_handoff_ohci.patch @@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/usb/host/pci-quirks.c +++ gregkh-2.6/drivers/usb/host/pci-quirks.c -@@ -168,8 +168,6 @@ static int __devinit mmio_resource_enabl +@@ -167,8 +167,6 @@ static int __devinit mmio_resource_enabl static void __devinit quirk_usb_handoff_ohci(struct pci_dev *pdev) { void __iomem *base; @@ -30,7 +30,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (!mmio_resource_enabled(pdev, 0)) return; -@@ -180,9 +178,10 @@ static void __devinit quirk_usb_handoff_ +@@ -179,9 +177,10 @@ static void __devinit quirk_usb_handoff_ /* On PA-RISC, PDC can leave IR set incorrectly; ignore it there. */ #ifndef __hppa__ @@ -43,7 +43,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> writel(OHCI_INTR_OC, base + OHCI_INTRENABLE); writel(OHCI_OCR, base + OHCI_CMDSTATUS); while (wait_time > 0 && -@@ -199,6 +198,7 @@ static void __devinit quirk_usb_handoff_ +@@ -198,6 +197,7 @@ static void __devinit quirk_usb_handoff_ /* reset controller, preserving RWC */ writel(control & OHCI_CTRL_RWC, base + OHCI_CONTROL); } diff --git a/usb/usb-move-linux-usb_otg.h-to-linux-usb-otg.h.patch b/usb/usb-move-linux-usb_otg.h-to-linux-usb-otg.h.patch index b07d5522c46b9a..6848652c7c95be 100644 --- a/usb/usb-move-linux-usb_otg.h-to-linux-usb-otg.h.patch +++ b/usb/usb-move-linux-usb_otg.h-to-linux-usb-otg.h.patch @@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/arch/arm/plat-omap/usb.c +++ gregkh-2.6/arch/arm/plat-omap/usb.c -@@ -27,7 +27,7 @@ +@@ -26,7 +26,7 @@ #include <linux/errno.h> #include <linux/init.h> #include <linux/platform_device.h> @@ -32,7 +32,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #include <asm/irq.h> --- gregkh-2.6.orig/drivers/i2c/chips/isp1301_omap.c +++ gregkh-2.6/drivers/i2c/chips/isp1301_omap.c -@@ -31,7 +31,7 @@ +@@ -30,7 +30,7 @@ #include <linux/usb_ch9.h> #include <linux/usb_gadget.h> #include <linux/usb.h> @@ -43,7 +43,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/usb/gadget/omap_udc.c +++ gregkh-2.6/drivers/usb/gadget/omap_udc.c -@@ -41,7 +41,7 @@ +@@ -40,7 +40,7 @@ #include <linux/platform_device.h> #include <linux/usb_ch9.h> #include <linux/usb_gadget.h> @@ -54,7 +54,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #include <asm/byteorder.h> --- gregkh-2.6.orig/drivers/usb/host/ohci-hcd.c +++ gregkh-2.6/drivers/usb/host/ohci-hcd.c -@@ -89,7 +89,7 @@ +@@ -88,7 +88,7 @@ #include <linux/timer.h> #include <linux/list.h> #include <linux/usb.h> diff --git a/usb/usb-new-device-id-for-thorlabs-motor-driver.patch b/usb/usb-new-device-id-for-thorlabs-motor-driver.patch index 86879bc0f36a08..8e80a69d30c845 100644 --- a/usb/usb-new-device-id-for-thorlabs-motor-driver.patch +++ b/usb/usb-new-device-id-for-thorlabs-motor-driver.patch @@ -12,7 +12,7 @@ Subject: USB: new device id for Thorlabs motor driver --- gregkh-2.6.orig/drivers/usb/serial/ftdi_sio.c +++ gregkh-2.6/drivers/usb/serial/ftdi_sio.c -@@ -501,6 +501,7 @@ static struct usb_device_id id_table_com +@@ -500,6 +500,7 @@ static struct usb_device_id id_table_com { USB_DEVICE(PAPOUCH_VID, PAPOUCH_TMU_PID) }, { USB_DEVICE(FTDI_VID, FTDI_ACG_HFDUAL_PID) }, { USB_DEVICE(FTDI_VID, FTDI_YEI_SERVOCENTER31_PID) }, diff --git a/usb/usb-new-device-ids-for-ftdi_sio-driver.patch b/usb/usb-new-device-ids-for-ftdi_sio-driver.patch index beff64355f127f..340c4ef62ccd83 100644 --- a/usb/usb-new-device-ids-for-ftdi_sio-driver.patch +++ b/usb/usb-new-device-ids-for-ftdi_sio-driver.patch @@ -17,7 +17,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/usb/serial/ftdi_sio.c +++ gregkh-2.6/drivers/usb/serial/ftdi_sio.c -@@ -314,6 +314,7 @@ static struct usb_device_id id_table_com +@@ -313,6 +313,7 @@ static struct usb_device_id id_table_com { USB_DEVICE(FTDI_VID, FTDI_8U232AM_PID) }, { USB_DEVICE(FTDI_VID, FTDI_8U232AM_ALT_PID) }, { USB_DEVICE(FTDI_VID, FTDI_8U2232C_PID) }, diff --git a/usb/usb-ohci-avoids-root-hub-timer-polling.patch b/usb/usb-ohci-avoids-root-hub-timer-polling.patch index d185612acd3836..67de2c21e9abde 100644 --- a/usb/usb-ohci-avoids-root-hub-timer-polling.patch +++ b/usb/usb-ohci-avoids-root-hub-timer-polling.patch @@ -55,7 +55,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> .bus_resume = ohci_bus_resume, --- gregkh-2.6.orig/drivers/usb/host/ohci-hcd.c +++ gregkh-2.6/drivers/usb/host/ohci-hcd.c -@@ -102,7 +102,7 @@ +@@ -101,7 +101,7 @@ #include "../core/hcd.h" @@ -64,7 +64,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define DRIVER_AUTHOR "Roman Weissgaerber, David Brownell" #define DRIVER_DESC "USB 1.1 'Open' Host Controller (OHCI) Driver" -@@ -111,7 +111,7 @@ +@@ -110,7 +110,7 @@ #undef OHCI_VERBOSE_DEBUG /* not always helpful */ /* For initializing controller (mask in an HCFS mode too) */ @@ -73,7 +73,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define OHCI_INTR_INIT \ (OHCI_INTR_MIE | OHCI_INTR_UE | OHCI_INTR_RD | OHCI_INTR_WDH) -@@ -447,7 +447,7 @@ static int ohci_init (struct ohci_hcd *o +@@ -446,7 +446,7 @@ static int ohci_init (struct ohci_hcd *o disable (ohci); ohci->regs = hcd->regs; @@ -82,7 +82,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* REVISIT this BIOS handshake is now moved into PCI "quirks", and * was never needed for most non-PCI systems ... remove the code? -@@ -637,11 +637,12 @@ retry: +@@ -636,11 +636,12 @@ retry: ohci_readl (ohci, &ohci->regs->periodicstart)); return -EOVERFLOW; } @@ -98,7 +98,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> hcd->state = HC_STATE_RUNNING; /* wake on ConnectStatusChange, matching external hubs */ -@@ -649,7 +650,7 @@ retry: +@@ -648,7 +649,7 @@ retry: /* Choose the interrupts we care about now, others later on demand */ mask = OHCI_INTR_INIT; @@ -107,7 +107,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ohci_writel (ohci, mask, &ohci->regs->intrenable); /* handle root hub init quirks ... */ -@@ -710,7 +711,16 @@ static irqreturn_t ohci_irq (struct usb_ +@@ -709,7 +710,16 @@ static irqreturn_t ohci_irq (struct usb_ /* interrupt for some other device? */ } else if ((ints &= ohci_readl (ohci, ®s->intrenable)) == 0) { return IRQ_NOTMINE; diff --git a/usb/usb-ohci-bits-for-the-cirrus-ep93xx.patch b/usb/usb-ohci-bits-for-the-cirrus-ep93xx.patch index e86b1e32a8eed4..38226f854f8694 100644 --- a/usb/usb-ohci-bits-for-the-cirrus-ep93xx.patch +++ b/usb/usb-ohci-bits-for-the-cirrus-ep93xx.patch @@ -259,7 +259,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +module_exit(ohci_hcd_ep93xx_cleanup); --- gregkh-2.6.orig/drivers/usb/host/ohci-hcd.c +++ gregkh-2.6/drivers/usb/host/ohci-hcd.c -@@ -902,6 +902,10 @@ MODULE_LICENSE ("GPL"); +@@ -901,6 +901,10 @@ MODULE_LICENSE ("GPL"); #include "ohci-pxa27x.c" #endif @@ -270,7 +270,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #ifdef CONFIG_SOC_AU1X00 #include "ohci-au1xxx.c" #endif -@@ -920,6 +924,7 @@ MODULE_LICENSE ("GPL"); +@@ -919,6 +923,7 @@ MODULE_LICENSE ("GPL"); || defined(CONFIG_ARCH_OMAP) \ || defined (CONFIG_ARCH_LH7A404) \ || defined (CONFIG_PXA27x) \ diff --git a/usb/usb-ohci-controller-support-for-pnx4008.patch b/usb/usb-ohci-controller-support-for-pnx4008.patch index dd604573d993ca..5d75662a37f724 100644 --- a/usb/usb-ohci-controller-support-for-pnx4008.patch +++ b/usb/usb-ohci-controller-support-for-pnx4008.patch @@ -45,7 +45,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> USB 1.1 host controller hardware. It does more in hardware than Intel's --- gregkh-2.6.orig/drivers/usb/host/ohci-hcd.c +++ gregkh-2.6/drivers/usb/host/ohci-hcd.c -@@ -928,6 +928,10 @@ MODULE_LICENSE ("GPL"); +@@ -927,6 +927,10 @@ MODULE_LICENSE ("GPL"); #include "ohci-at91.c" #endif @@ -56,7 +56,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #if !(defined(CONFIG_PCI) \ || defined(CONFIG_SA1111) \ || defined(CONFIG_ARCH_S3C2410) \ -@@ -939,6 +943,7 @@ MODULE_LICENSE ("GPL"); +@@ -938,6 +942,7 @@ MODULE_LICENSE ("GPL"); || defined (CONFIG_USB_OHCI_HCD_PPC_SOC) \ || defined (CONFIG_ARCH_AT91RM9200) \ || defined (CONFIG_ARCH_AT91SAM9261) \ diff --git a/usb/usb-pxa2xx_udc-understands-gpio-based-vbus-sensing.patch b/usb/usb-pxa2xx_udc-understands-gpio-based-vbus-sensing.patch index 70896d80002f08..f7a45238340231 100644 --- a/usb/usb-pxa2xx_udc-understands-gpio-based-vbus-sensing.patch +++ b/usb/usb-pxa2xx_udc-understands-gpio-based-vbus-sensing.patch @@ -61,7 +61,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> pxa_set_udc_info(&udc_info); --- gregkh-2.6.orig/drivers/usb/gadget/pxa2xx_udc.c +++ gregkh-2.6/drivers/usb/gadget/pxa2xx_udc.c -@@ -151,6 +151,39 @@ MODULE_PARM_DESC (fifo_mode, "pxa2xx udc +@@ -150,6 +150,39 @@ MODULE_PARM_DESC (fifo_mode, "pxa2xx udc static void pxa2xx_ep_fifo_flush (struct usb_ep *ep); static void nuke (struct pxa2xx_ep *, int status); @@ -101,7 +101,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static void pio_irq_enable(int bEndpointAddress) { bEndpointAddress &= 0xf; -@@ -1722,6 +1755,16 @@ lubbock_vbus_irq(int irq, void *_dev, st +@@ -1721,6 +1754,16 @@ lubbock_vbus_irq(int irq, void *_dev, st #endif @@ -118,7 +118,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /*-------------------------------------------------------------------------*/ -@@ -2439,7 +2482,7 @@ static struct pxa2xx_udc memory = { +@@ -2438,7 +2481,7 @@ static struct pxa2xx_udc memory = { static int __init pxa2xx_udc_probe(struct platform_device *pdev) { struct pxa2xx_udc *dev = &memory; @@ -127,7 +127,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> u32 chiprev; /* insist on Intel/ARM/XScale */ -@@ -2503,6 +2546,16 @@ static int __init pxa2xx_udc_probe(struc +@@ -2502,6 +2545,16 @@ static int __init pxa2xx_udc_probe(struc /* other non-static parts of init */ dev->dev = &pdev->dev; dev->mach = pdev->dev.platform_data; @@ -144,7 +144,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> init_timer(&dev->timer); dev->timer.function = udc_watchdog; -@@ -2558,8 +2611,19 @@ lubbock_fail0: +@@ -2557,8 +2610,19 @@ lubbock_fail0: HEX_DISPLAY(dev->stats.irqs); LUB_DISC_BLNK_LED &= 0xff; #endif @@ -165,7 +165,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> create_proc_files(); return 0; -@@ -2588,6 +2652,8 @@ static int __exit pxa2xx_udc_remove(stru +@@ -2587,6 +2651,8 @@ static int __exit pxa2xx_udc_remove(stru free_irq(LUBBOCK_USB_IRQ, dev); } #endif diff --git a/usb/usb-serial-dynamic-id.patch b/usb/usb-serial-dynamic-id.patch index 01efd6cde087be..d249887fb1d070 100644 --- a/usb/usb-serial-dynamic-id.patch +++ b/usb/usb-serial-dynamic-id.patch @@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- --- gregkh-2.6.orig/drivers/usb/core/driver.c +++ gregkh-2.6/drivers/usb/core/driver.c -@@ -27,15 +27,6 @@ +@@ -26,15 +26,6 @@ #include "hcd.h" #include "usb.h" @@ -41,7 +41,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static int generic_probe(struct device *dev) { return 0; -@@ -73,10 +64,10 @@ int usb_generic_driver_data; +@@ -72,10 +63,10 @@ int usb_generic_driver_data; * Adds a new dynamic USBdevice ID to this driver, * and cause the driver to probe for all devices again. */ @@ -55,7 +55,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> struct usb_dynid *dynid; u32 idVendor = 0; u32 idProduct = 0; -@@ -85,6 +76,7 @@ static ssize_t store_new_id(struct devic +@@ -84,6 +75,7 @@ static ssize_t store_new_id(struct devic fields = sscanf(buf, "%x %x", &idVendor, &idProduct); if (fields < 2) return -EINVAL; @@ -63,7 +63,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dynid = kzalloc(sizeof(*dynid), GFP_KERNEL); if (!dynid) -@@ -95,9 +87,9 @@ static ssize_t store_new_id(struct devic +@@ -94,9 +86,9 @@ static ssize_t store_new_id(struct devic dynid->id.idProduct = idProduct; dynid->id.match_flags = USB_DEVICE_ID_MATCH_DEVICE; @@ -76,7 +76,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (get_driver(driver)) { driver_attach(driver); -@@ -106,6 +98,15 @@ static ssize_t store_new_id(struct devic +@@ -105,6 +97,15 @@ static ssize_t store_new_id(struct devic return count; } @@ -92,7 +92,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static DRIVER_ATTR(new_id, S_IWUSR, NULL, store_new_id); static int usb_create_newid_file(struct usb_driver *usb_drv) -@@ -240,8 +241,8 @@ static int usb_unbind_interface(struct d +@@ -239,8 +240,8 @@ static int usb_unbind_interface(struct d } /* returns 0 if no match, 1 if match */ @@ -103,7 +103,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { struct usb_host_interface *intf; struct usb_device *dev; -@@ -297,6 +298,8 @@ static int usb_match_one_id(struct usb_i +@@ -296,6 +297,8 @@ static int usb_match_one_id(struct usb_i return 1; } @@ -114,7 +114,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> * @interface: the interface of interest --- gregkh-2.6.orig/drivers/usb/serial/bus.c +++ gregkh-2.6/drivers/usb/serial/bus.c -@@ -104,11 +104,57 @@ exit: +@@ -103,11 +103,57 @@ exit: return retval; } @@ -172,7 +172,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> }; int usb_serial_bus_register(struct usb_serial_driver *driver) -@@ -116,6 +162,9 @@ int usb_serial_bus_register(struct usb_s +@@ -115,6 +161,9 @@ int usb_serial_bus_register(struct usb_s int retval; driver->driver.bus = &usb_serial_bus_type; @@ -182,7 +182,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> retval = driver_register(&driver->driver); return retval; -@@ -123,6 +172,7 @@ int usb_serial_bus_register(struct usb_s +@@ -122,6 +171,7 @@ int usb_serial_bus_register(struct usb_s void usb_serial_bus_deregister(struct usb_serial_driver *driver) { @@ -192,7 +192,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/usb/serial/usb-serial.c +++ gregkh-2.6/drivers/usb/serial/usb-serial.c -@@ -44,7 +44,7 @@ +@@ -43,7 +43,7 @@ static void port_free(struct usb_serial_port *port); /* Driver structure we register with the USB core */ @@ -201,7 +201,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> .name = "usbserial", .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, -@@ -594,6 +594,39 @@ static struct usb_serial * create_serial +@@ -593,6 +593,39 @@ static struct usb_serial * create_serial return serial; } @@ -241,7 +241,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static struct usb_serial_driver *search_serial_device(struct usb_interface *iface) { struct list_head *p; -@@ -603,11 +636,9 @@ static struct usb_serial_driver *search_ +@@ -602,11 +635,9 @@ static struct usb_serial_driver *search_ /* Check if the usb id matches a known device */ list_for_each(p, &usb_serial_driver_list) { t = list_entry(p, struct usb_serial_driver, driver_list); @@ -255,7 +255,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } return NULL; -@@ -659,7 +690,7 @@ int usb_serial_probe(struct usb_interfac +@@ -658,7 +689,7 @@ int usb_serial_probe(struct usb_interfac return -EIO; } @@ -266,7 +266,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/usb/serial/usb-serial.h +++ gregkh-2.6/drivers/usb/serial/usb-serial.h -@@ -203,6 +203,7 @@ struct usb_serial_driver { +@@ -202,6 +202,7 @@ struct usb_serial_driver { struct list_head driver_list; struct device_driver driver; @@ -274,7 +274,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> int (*probe) (struct usb_serial *serial, const struct usb_device_id *id); int (*attach) (struct usb_serial *serial); -@@ -273,6 +274,7 @@ extern int usb_serial_bus_register (stru +@@ -272,6 +273,7 @@ extern int usb_serial_bus_register (stru extern void usb_serial_bus_deregister (struct usb_serial_driver *device); extern struct usb_serial_driver usb_serial_generic_device; diff --git a/usb/usb-serial-ftdi_sio-prevent-userspace-dos.patch b/usb/usb-serial-ftdi_sio-prevent-userspace-dos.patch index a61e99ce6349aa..4b4d9cfea17618 100644 --- a/usb/usb-serial-ftdi_sio-prevent-userspace-dos.patch +++ b/usb/usb-serial-ftdi_sio-prevent-userspace-dos.patch @@ -31,7 +31,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/usb/serial/ftdi_sio.c +++ gregkh-2.6/drivers/usb/serial/ftdi_sio.c -@@ -551,11 +551,17 @@ struct ftdi_private { +@@ -550,11 +550,17 @@ struct ftdi_private { spinlock_t rx_lock; /* spinlock for receive state */ struct work_struct rx_work; int rx_processed; @@ -49,7 +49,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> }; /* Used for TIOCMIWAIT */ -@@ -629,6 +635,9 @@ static struct usb_serial_driver ftdi_sio +@@ -628,6 +634,9 @@ static struct usb_serial_driver ftdi_sio #define HIGH 1 #define LOW 0 @@ -59,7 +59,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* * *************************************************************************** * Utlity functions -@@ -1159,6 +1168,7 @@ static int ftdi_sio_attach (struct usb_s +@@ -1158,6 +1167,7 @@ static int ftdi_sio_attach (struct usb_s } spin_lock_init(&priv->rx_lock); @@ -67,7 +67,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> init_waitqueue_head(&priv->delta_msr_wait); /* This will push the characters through immediately rather than queue a task to deliver them */ -@@ -1273,6 +1283,13 @@ static int ftdi_open (struct usb_serial +@@ -1272,6 +1282,13 @@ static int ftdi_open (struct usb_serial dbg("%s", __FUNCTION__); @@ -81,7 +81,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (port->tty) port->tty->low_latency = (priv->flags & ASYNC_LOW_LATENCY) ? 1 : 0; -@@ -1375,6 +1392,7 @@ static int ftdi_write (struct usb_serial +@@ -1374,6 +1391,7 @@ static int ftdi_write (struct usb_serial int data_offset ; /* will be 1 for the SIO and 0 otherwise */ int status; int transfer_size; @@ -89,7 +89,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dbg("%s port %d, %d bytes", __FUNCTION__, port->number, count); -@@ -1382,6 +1400,13 @@ static int ftdi_write (struct usb_serial +@@ -1381,6 +1399,13 @@ static int ftdi_write (struct usb_serial dbg("write request of 0 bytes"); return 0; } @@ -103,7 +103,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> data_offset = priv->write_offset; dbg("data_offset set to %d",data_offset); -@@ -1448,6 +1473,12 @@ static int ftdi_write (struct usb_serial +@@ -1447,6 +1472,12 @@ static int ftdi_write (struct usb_serial err("%s - failed submitting write urb, error %d", __FUNCTION__, status); count = status; kfree (buffer); @@ -116,7 +116,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /* we are done with this urb, so let the host driver -@@ -1463,7 +1494,11 @@ static int ftdi_write (struct usb_serial +@@ -1462,7 +1493,11 @@ static int ftdi_write (struct usb_serial static void ftdi_write_bulk_callback (struct urb *urb, struct pt_regs *regs) { @@ -128,7 +128,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* free up the transfer buffer, as usb_free_urb() does not do this */ kfree (urb->transfer_buffer); -@@ -1475,34 +1510,67 @@ static void ftdi_write_bulk_callback (st +@@ -1474,34 +1509,67 @@ static void ftdi_write_bulk_callback (st return; } @@ -209,7 +209,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /* ftdi_chars_in_buffer */ -@@ -1512,6 +1580,8 @@ static void ftdi_read_bulk_callback (str +@@ -1511,6 +1579,8 @@ static void ftdi_read_bulk_callback (str struct usb_serial_port *port = (struct usb_serial_port *)urb->context; struct tty_struct *tty; struct ftdi_private *priv; @@ -218,7 +218,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (urb->number_of_packets > 0) { err("%s transfer_buffer_length %d actual_length %d number of packets %d",__FUNCTION__, -@@ -1546,6 +1616,13 @@ static void ftdi_read_bulk_callback (str +@@ -1545,6 +1615,13 @@ static void ftdi_read_bulk_callback (str return; } diff --git a/usb/usb-serial-visor-fix-race-in-open-close.patch b/usb/usb-serial-visor-fix-race-in-open-close.patch index c6482430c49d15..9d76b4b6e014bb 100644 --- a/usb/usb-serial-visor-fix-race-in-open-close.patch +++ b/usb/usb-serial-visor-fix-race-in-open-close.patch @@ -35,7 +35,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/usb/serial/visor.c +++ gregkh-2.6/drivers/usb/serial/visor.c -@@ -303,7 +303,6 @@ static int visor_open (struct usb_serial +@@ -302,7 +302,6 @@ static int visor_open (struct usb_serial spin_lock_irqsave(&priv->lock, flags); priv->bytes_in = 0; priv->bytes_out = 0; diff --git a/usb/usb-storage-fix-race-between-reset-and-disconnect.patch b/usb/usb-storage-fix-race-between-reset-and-disconnect.patch index f6c51699daa596..60454e66dfc39f 100644 --- a/usb/usb-storage-fix-race-between-reset-and-disconnect.patch +++ b/usb/usb-storage-fix-race-between-reset-and-disconnect.patch @@ -23,7 +23,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/usb/storage/usb.c +++ gregkh-2.6/drivers/usb/storage/usb.c -@@ -374,8 +374,12 @@ static int usb_stor_control_thread(void +@@ -373,8 +373,12 @@ static int usb_stor_control_thread(void /* lock access to the state */ scsi_lock(host); @@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> US_DEBUGP("scsi cmd done, result=0x%x\n", us->srb->result); us->srb->scsi_done(us->srb); -@@ -837,32 +841,34 @@ static void dissociate_dev(struct us_dat +@@ -836,32 +840,34 @@ static void dissociate_dev(struct us_dat * the host */ static void quiesce_and_remove_host(struct us_data *us) { diff --git a/usb/usb-storage-uname-in-pr-sc-unneeded-message.patch b/usb/usb-storage-uname-in-pr-sc-unneeded-message.patch index a28d047e25cbad..bf339155b75f96 100644 --- a/usb/usb-storage-uname-in-pr-sc-unneeded-message.patch +++ b/usb/usb-storage-uname-in-pr-sc-unneeded-message.patch @@ -18,15 +18,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/usb/storage/usb.c +++ gregkh-2.6/drivers/usb/storage/usb.c -@@ -47,6 +47,7 @@ - * 675 Mass Ave, Cambridge, MA 02139, USA. - */ - +@@ -55,6 +55,7 @@ + #include <linux/slab.h> + #include <linux/kthread.h> + #include <linux/mutex.h> +#include <linux/version.h> - #include <linux/config.h> - #include <linux/sched.h> - #include <linux/errno.h> -@@ -529,7 +530,8 @@ static void get_device_info(struct us_da + + #include <scsi/scsi.h> + #include <scsi/scsi_cmnd.h> +@@ -528,7 +529,8 @@ static void get_device_info(struct us_da if (msg >= 0 && !(us->flags & US_FL_NEED_OVERRIDE)) printk(KERN_NOTICE USB_STORAGE "This device " "(%04x,%04x,%04x S %02x P %02x)" @@ -36,7 +36,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> " Please send a copy of this message to " "<linux-usb-devel@lists.sourceforge.net>\n", le16_to_cpu(ddesc->idVendor), -@@ -537,7 +539,8 @@ static void get_device_info(struct us_da +@@ -536,7 +538,8 @@ static void get_device_info(struct us_da le16_to_cpu(ddesc->bcdDevice), idesc->bInterfaceSubClass, idesc->bInterfaceProtocol, diff --git a/usb/usb-storage-unusual_devs-entry-for-motorola-razr-v3x.patch b/usb/usb-storage-unusual_devs-entry-for-motorola-razr-v3x.patch index 5d4f94ba4c0f5d..0593aea2979a70 100644 --- a/usb/usb-storage-unusual_devs-entry-for-motorola-razr-v3x.patch +++ b/usb/usb-storage-unusual_devs-entry-for-motorola-razr-v3x.patch @@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/usb/storage/unusual_devs.h +++ gregkh-2.6/drivers/usb/storage/unusual_devs.h -@@ -1228,6 +1228,15 @@ UNUSUAL_DEV( 0x1370, 0x6828, 0x0110, 0x +@@ -1227,6 +1227,15 @@ UNUSUAL_DEV( 0x1370, 0x6828, 0x0110, 0x US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_IGNORE_RESIDUE ), diff --git a/usb/usb-storage-us_fl_max_sectors_64-flag.patch b/usb/usb-storage-us_fl_max_sectors_64-flag.patch index 59811c57f4f427..caf9dd829413cd 100644 --- a/usb/usb-storage-us_fl_max_sectors_64-flag.patch +++ b/usb/usb-storage-us_fl_max_sectors_64-flag.patch @@ -45,7 +45,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/usb/storage/unusual_devs.h +++ gregkh-2.6/drivers/usb/storage/unusual_devs.h -@@ -716,18 +716,22 @@ UNUSUAL_DEV( 0x05dc, 0xb002, 0x0000, 0x +@@ -715,18 +715,22 @@ UNUSUAL_DEV( 0x05dc, 0xb002, 0x0000, 0x * They were originally reported by Alexander Oltu * <alexander@all-2.com> and Peter Marks <peter.marks@turner.com> * respectively. @@ -70,7 +70,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Reported by Hanno Boeck <hanno@gmx.de> * Taken from the Lycoris Kernel */ -@@ -1204,6 +1208,14 @@ UNUSUAL_DEV( 0x0ea0, 0x6828, 0x0110, 0x +@@ -1203,6 +1207,14 @@ UNUSUAL_DEV( 0x0ea0, 0x6828, 0x0110, 0x US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_IGNORE_RESIDUE ), diff --git a/usb/usb-support-for-susteen-datapilot-universal-2-cable-in-pl2303.patch b/usb/usb-support-for-susteen-datapilot-universal-2-cable-in-pl2303.patch index a7c00d3a72e284..d686aac63df021 100644 --- a/usb/usb-support-for-susteen-datapilot-universal-2-cable-in-pl2303.patch +++ b/usb/usb-support-for-susteen-datapilot-universal-2-cable-in-pl2303.patch @@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/usb/serial/pl2303.c +++ gregkh-2.6/drivers/usb/serial/pl2303.c -@@ -81,6 +81,7 @@ static struct usb_device_id id_table [] +@@ -80,6 +80,7 @@ static struct usb_device_id id_table [] { USB_DEVICE(LEADTEK_VENDOR_ID, LEADTEK_9531_PRODUCT_ID) }, { USB_DEVICE(SPEEDDRAGON_VENDOR_ID, SPEEDDRAGON_PRODUCT_ID) }, { USB_DEVICE(OTI_VENDOR_ID, OTI_PRODUCT_ID) }, diff --git a/usb/usb-unusual_devs-entry-for-samsung-mp3-player.patch b/usb/usb-unusual_devs-entry-for-samsung-mp3-player.patch index 36cc096f352dfa..2d49804d0970b9 100644 --- a/usb/usb-unusual_devs-entry-for-samsung-mp3-player.patch +++ b/usb/usb-unusual_devs-entry-for-samsung-mp3-player.patch @@ -23,7 +23,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/usb/storage/unusual_devs.h +++ gregkh-2.6/drivers/usb/storage/unusual_devs.h -@@ -113,6 +113,13 @@ UNUSUAL_DEV( 0x0411, 0x001c, 0x0113, 0x +@@ -112,6 +112,13 @@ UNUSUAL_DEV( 0x0411, 0x001c, 0x0113, 0x US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY ), diff --git a/usb/usbcore-fixes-for-hub_port_resume.patch b/usb/usbcore-fixes-for-hub_port_resume.patch index cb7b77b8fb52f8..60b3655a959e7b 100644 --- a/usb/usbcore-fixes-for-hub_port_resume.patch +++ b/usb/usbcore-fixes-for-hub_port_resume.patch @@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/usb/core/hub.c +++ gregkh-2.6/drivers/usb/core/hub.c -@@ -1883,7 +1883,12 @@ hub_port_resume(struct usb_hub *hub, int +@@ -1882,7 +1882,12 @@ hub_port_resume(struct usb_hub *hub, int dev_dbg(hub->intfdev, "port %d status %04x.%04x after resume, %d\n", port1, portchange, devstatus, status); diff --git a/usb/usbfs-use-the-correct-signal-number-for-disconnection.patch b/usb/usbfs-use-the-correct-signal-number-for-disconnection.patch index 6f5e250f18bbb6..3b143635710688 100644 --- a/usb/usbfs-use-the-correct-signal-number-for-disconnection.patch +++ b/usb/usbfs-use-the-correct-signal-number-for-disconnection.patch @@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/usb/core/inode.c +++ gregkh-2.6/drivers/usb/core/inode.c -@@ -696,7 +696,7 @@ static void usbfs_remove_device(struct u +@@ -695,7 +695,7 @@ static void usbfs_remove_device(struct u wake_up_all(&ds->wait); list_del_init(&ds->list); if (ds->discsignr) { |