diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-11-23 11:34:24 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-11-23 11:34:24 -0800 |
commit | b493d45d58c5b347d2d62f8aa18dec9a8dea6032 (patch) | |
tree | 43b50d063dac18f2cf16736ab3ddd5d283ba3d35 /usb | |
parent | 80129314f40abcb6f9b25b9a32784960cbaf3af2 (diff) | |
download | patches-b493d45d58c5b347d2d62f8aa18dec9a8dea6032.tar.gz |
move usb patches around a bit.
Diffstat (limited to 'usb')
-rw-r--r-- | usb/one-potential-problem-in-gadget-serial.c.patch | 2 | ||||
-rw-r--r-- | usb/remove-usb-private-semaphore.patch | 4 | ||||
-rw-r--r-- | usb/usb-driver-owner-removal.patch | 19 | ||||
-rw-r--r-- | usb/usb-driver-owner.patch | 2 | ||||
-rw-r--r-- | usb/usb-drivers-usb-core-message.c-make-usb_get_string-static.patch | 2 | ||||
-rw-r--r-- | usb/usb-dynamic-id-02.patch | 6 | ||||
-rw-r--r-- | usb/usb-dynamic-id-03.patch | 6 | ||||
-rw-r--r-- | usb/usb-libusual.patch | 2 |
8 files changed, 27 insertions, 16 deletions
diff --git a/usb/one-potential-problem-in-gadget-serial.c.patch b/usb/one-potential-problem-in-gadget-serial.c.patch index 0737d1db062c12..ed0c03a6c065d1 100644 --- a/usb/one-potential-problem-in-gadget-serial.c.patch +++ b/usb/one-potential-problem-in-gadget-serial.c.patch @@ -16,7 +16,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/usb/gadget/serial.c +++ gregkh-2.6/drivers/usb/gadget/serial.c -@@ -889,10 +889,12 @@ static void gs_close(struct tty_struct * +@@ -890,10 +890,12 @@ static void gs_close(struct tty_struct * /* wait for write buffer to drain, or */ /* at most GS_CLOSE_TIMEOUT seconds */ if (gs_buf_data_avail(port->port_write_buf) > 0) { diff --git a/usb/remove-usb-private-semaphore.patch b/usb/remove-usb-private-semaphore.patch index 67b795b4747211..8d74a19c855d14 100644 --- a/usb/remove-usb-private-semaphore.patch +++ b/usb/remove-usb-private-semaphore.patch @@ -246,7 +246,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> del_timer_sync(&hcd->rh_timer); --- gregkh-2.6.orig/include/linux/usb.h +++ gregkh-2.6/include/linux/usb.h -@@ -328,8 +328,6 @@ struct usb_device { +@@ -329,8 +329,6 @@ struct usb_device { struct usb_tt *tt; /* low/full speed dev, highspeed hub */ int ttport; /* device port on that tt hub */ @@ -255,7 +255,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> unsigned int toggle[2]; /* one bit for each endpoint * ([0] = IN, [1] = OUT) */ -@@ -376,11 +374,12 @@ struct usb_device { +@@ -377,11 +375,12 @@ struct usb_device { extern struct usb_device *usb_get_dev(struct usb_device *dev); extern void usb_put_dev(struct usb_device *dev); diff --git a/usb/usb-driver-owner-removal.patch b/usb/usb-driver-owner-removal.patch index 00be664eca49e5..ae78bdcb59d278 100644 --- a/usb/usb-driver-owner-removal.patch +++ b/usb/usb-driver-owner-removal.patch @@ -68,6 +68,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/usb/media/sn9c102_core.c | 1 - drivers/usb/media/stv680.c | 1 - drivers/usb/media/vicam.c | 1 - + drivers/usb/media/w9968cf.c | 1 - drivers/usb/misc/auerswald.c | 1 - drivers/usb/misc/cytherm.c | 1 - drivers/usb/misc/emi26.c | 1 - @@ -130,7 +131,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> include/linux/usb.h | 4 ---- sound/usb/usbaudio.c | 1 - sound/usb/usx2y/usbusx2y.c | 1 - - 122 files changed, 125 deletions(-) + 123 files changed, 126 deletions(-) --- gregkh-2.6.orig/drivers/usb/core/devio.c +++ gregkh-2.6/drivers/usb/core/devio.c @@ -154,7 +155,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> .disconnect = hub_disconnect, --- gregkh-2.6.orig/include/linux/usb.h +++ gregkh-2.6/include/linux/usb.h -@@ -535,8 +535,6 @@ struct usb_dynids { +@@ -536,8 +536,6 @@ struct usb_dynids { /** * struct usb_driver - identifies USB driver to usbcore @@ -163,7 +164,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> * @name: The driver name should be unique among USB drivers, * and should normally be the same as the module name. * @probe: Called to see if the driver is willing to manage a particular -@@ -579,8 +577,6 @@ struct usb_dynids { +@@ -580,8 +578,6 @@ struct usb_dynids { * them as necessary, and blocking until the unlinks complete). */ struct usb_driver { @@ -304,7 +305,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> .disconnect = usb_serial_disconnect, --- gregkh-2.6.orig/drivers/usb/serial/ipw.c +++ gregkh-2.6/drivers/usb/serial/ipw.c -@@ -153,7 +153,6 @@ static struct usb_device_id usb_ipw_ids[ +@@ -152,7 +152,6 @@ static struct usb_device_id usb_ipw_ids[ MODULE_DEVICE_TABLE(usb, usb_ipw_ids); static struct usb_driver usb_ipw_driver = { @@ -1362,3 +1363,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> .name = "iforce", .probe = iforce_usb_probe, .disconnect = iforce_usb_disconnect, +--- gregkh-2.6.orig/drivers/usb/media/w9968cf.c ++++ gregkh-2.6/drivers/usb/media/w9968cf.c +@@ -3668,7 +3668,6 @@ static void w9968cf_usb_disconnect(struc + + + static struct usb_driver w9968cf_usb_driver = { +- .owner = THIS_MODULE, + .name = "w9968cf", + .id_table = winbond_id_table, + .probe = w9968cf_usb_probe, diff --git a/usb/usb-driver-owner.patch b/usb/usb-driver-owner.patch index 914ced3cc77a33..727140c275886f 100644 --- a/usb/usb-driver-owner.patch +++ b/usb/usb-driver-owner.patch @@ -56,7 +56,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> * usb_deregister - unregister a USB driver --- gregkh-2.6.orig/include/linux/usb.h +++ gregkh-2.6/include/linux/usb.h -@@ -624,7 +624,11 @@ struct usb_class_driver { +@@ -625,7 +625,11 @@ struct usb_class_driver { * use these in module_init()/module_exit() * and don't forget MODULE_DEVICE_TABLE(usb, ...) */ diff --git a/usb/usb-drivers-usb-core-message.c-make-usb_get_string-static.patch b/usb/usb-drivers-usb-core-message.c-make-usb_get_string-static.patch index 648a2b8adbca9b..1f4a9a12229dd0 100644 --- a/usb/usb-drivers-usb-core-message.c-make-usb_get_string-static.patch +++ b/usb/usb-drivers-usb-core-message.c-make-usb_get_string-static.patch @@ -20,7 +20,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/include/linux/usb.h +++ gregkh-2.6/include/linux/usb.h -@@ -1004,8 +1004,6 @@ extern int usb_get_descriptor(struct usb +@@ -1005,8 +1005,6 @@ extern int usb_get_descriptor(struct usb unsigned char descindex, void *buf, int size); extern int usb_get_status(struct usb_device *dev, int type, int target, void *data); diff --git a/usb/usb-dynamic-id-02.patch b/usb/usb-dynamic-id-02.patch index ee9310d55d613a..28200bc23b81a6 100644 --- a/usb/usb-dynamic-id-02.patch +++ b/usb/usb-dynamic-id-02.patch @@ -321,7 +321,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/include/linux/usb.h +++ gregkh-2.6/include/linux/usb.h -@@ -528,6 +528,11 @@ static inline int usb_make_path (struct +@@ -529,6 +529,11 @@ static inline int usb_make_path (struct /* ----------------------------------------------------------------------- */ @@ -333,7 +333,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /** * struct usb_driver - identifies USB driver to usbcore * @owner: Pointer to the module owner of this driver; initialize -@@ -552,6 +557,8 @@ static inline int usb_make_path (struct +@@ -553,6 +558,8 @@ static inline int usb_make_path (struct * @id_table: USB drivers use ID table to support hotplugging. * Export this with MODULE_DEVICE_TABLE(usb,...). This must be set * or your driver's probe function will never get called. @@ -342,7 +342,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> * @driver: the driver model core driver structure. * * USB drivers must provide a name, probe() and disconnect() methods, -@@ -587,6 +594,7 @@ struct usb_driver { +@@ -588,6 +595,7 @@ struct usb_driver { const struct usb_device_id *id_table; diff --git a/usb/usb-dynamic-id-03.patch b/usb/usb-dynamic-id-03.patch index 7b75e20d8e3a4a..105a2c1cd9c731 100644 --- a/usb/usb-dynamic-id-03.patch +++ b/usb/usb-dynamic-id-03.patch @@ -118,7 +118,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> usb_unlock_all_devices(); --- gregkh-2.6.orig/include/linux/usb.h +++ gregkh-2.6/include/linux/usb.h -@@ -560,6 +560,8 @@ struct usb_dynids { +@@ -561,6 +561,8 @@ struct usb_dynids { * @dynids: used internally to hold the list of dynamically added device * ids for this driver. * @driver: the driver model core driver structure. @@ -127,7 +127,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> * * USB drivers must provide a name, probe() and disconnect() methods, * and an id_table. Other driver fields are optional. -@@ -596,6 +598,7 @@ struct usb_driver { +@@ -597,6 +599,7 @@ struct usb_driver { struct usb_dynids dynids; struct device_driver driver; @@ -287,7 +287,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/usb/serial/ipw.c +++ gregkh-2.6/drivers/usb/serial/ipw.c -@@ -158,6 +158,7 @@ static struct usb_driver usb_ipw_driver +@@ -157,6 +157,7 @@ static struct usb_driver usb_ipw_driver .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, .id_table = usb_ipw_ids, diff --git a/usb/usb-libusual.patch b/usb/usb-libusual.patch index 940f38737b7f0a..10fb446d3cac83 100644 --- a/usb/usb-libusual.patch +++ b/usb/usb-libusual.patch @@ -479,7 +479,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 -@@ -1125,3 +1125,27 @@ UNUSUAL_DEV( 0x55aa, 0xa103, 0x0000, 0x +@@ -1134,3 +1134,27 @@ UNUSUAL_DEV( 0x55aa, 0xa103, 0x0000, 0x US_SC_SCSI, US_PR_SDDR55, NULL, US_FL_SINGLE_LUN), #endif |