diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-10 09:52:39 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-10 09:52:39 -0800 |
| commit | e781fd60c26c83812bb447970ace13d5fe48aeea (patch) | |
| tree | 950cb73c1f899feb927714029b0e9ebc049200fd /usb | |
| parent | 417248e494454b1add4cad702bd02236cd710d94 (diff) | |
| download | patches-e781fd60c26c83812bb447970ace13d5fe48aeea.tar.gz | |
2.6.15-git6 refresh
Diffstat (limited to 'usb')
4 files changed, 7 insertions, 7 deletions
diff --git a/usb/usb-drivers-usb-media-ov511.c-remove-hooks-for-the-decomp-module.patch b/usb/usb-drivers-usb-media-ov511.c-remove-hooks-for-the-decomp-module.patch index c855a6b41be6e..c12e229c5f1f4 100644 --- a/usb/usb-drivers-usb-media-ov511.c-remove-hooks-for-the-decomp-module.patch +++ b/usb/usb-drivers-usb-media-ov511.c-remove-hooks-for-the-decomp-module.patch @@ -185,7 +185,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (ov->led_policy == LED_AUTO) ov51x_led_control(ov, 0); -@@ -6020,82 +5906,6 @@ static struct usb_driver ov511_driver = +@@ -6021,82 +5907,6 @@ static struct usb_driver ov511_driver = * ***************************************************************************/ @@ -268,7 +268,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static int __init usb_ov511_init(void) { -@@ -6122,5 +5932,3 @@ usb_ov511_exit(void) +@@ -6123,5 +5933,3 @@ usb_ov511_exit(void) module_init(usb_ov511_init); module_exit(usb_ov511_exit); diff --git a/usb/usb-drivers-usb-media-w9968cf.c-remove-hooks-for-the-vpp-module.patch b/usb/usb-drivers-usb-media-w9968cf.c-remove-hooks-for-the-vpp-module.patch index 00bf6be599036..a49fc8b7cda6b 100644 --- a/usb/usb-drivers-usb-media-w9968cf.c-remove-hooks-for-the-vpp-module.patch +++ b/usb/usb-drivers-usb-media-w9968cf.c-remove-hooks-for-the-vpp-module.patch @@ -121,7 +121,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (cam->disconnected) { w9968cf_release_resources(cam); up(&cam->dev_sem); -@@ -3680,106 +3657,6 @@ static struct usb_driver w9968cf_usb_dri +@@ -3681,106 +3658,6 @@ static struct usb_driver w9968cf_usb_dri * Module init, exit and intermodule communication * ****************************************************************************/ @@ -228,7 +228,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static int __init w9968cf_module_init(void) { int err; -@@ -3809,6 +3686,3 @@ static void __exit w9968cf_module_exit(v +@@ -3810,6 +3687,3 @@ static void __exit w9968cf_module_exit(v module_init(w9968cf_module_init); module_exit(w9968cf_module_exit); diff --git a/usb/usb-kzalloc-in-w9968cf.patch b/usb/usb-kzalloc-in-w9968cf.patch index 384200e4cbf74..0b4e2370274db 100644 --- a/usb/usb-kzalloc-in-w9968cf.patch +++ b/usb/usb-kzalloc-in-w9968cf.patch @@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /* Allocate memory for the temporary frame buffer */ -@@ -3498,12 +3497,10 @@ w9968cf_usb_probe(struct usb_interface* +@@ -3499,12 +3498,10 @@ w9968cf_usb_probe(struct usb_interface* return -ENODEV; cam = (struct w9968cf_device*) @@ -47,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> init_MUTEX(&cam->dev_sem); down(&cam->dev_sem); -@@ -3531,21 +3528,19 @@ w9968cf_usb_probe(struct usb_interface* +@@ -3532,21 +3529,19 @@ w9968cf_usb_probe(struct usb_interface* /* Allocate 2 bytes of memory for camera control USB transfers */ diff --git a/usb/usb-serial-dynamic-id.patch b/usb/usb-serial-dynamic-id.patch index c0b8f3d9264c2..8dccd25604903 100644 --- a/usb/usb-serial-dynamic-id.patch +++ b/usb/usb-serial-dynamic-id.patch @@ -302,7 +302,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { struct list_head *p; @@ -587,11 +620,9 @@ static struct usb_serial_driver *search_ - /* List trough know devices and see if the usb id matches */ + /* 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); - id = usb_match_id(iface, t->id_table); |