diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-02 13:01:45 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-02 13:01:45 -0700 |
| commit | 29a6d6319c95efcb8830387b23501d87ca42b1e6 (patch) | |
| tree | f9cdf193587cc6dc7444c2e277f55ca00cd24117 /usb | |
| parent | 26c7e2f47241d049ca0c963cda1c987bbdd2687e (diff) | |
| download | patches-29a6d6319c95efcb8830387b23501d87ca42b1e6.tar.gz | |
updates
Diffstat (limited to 'usb')
| -rw-r--r-- | usb/usb-gadget-don-t-save-bind-callback-in-struct-usb_composite_driver.patch | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/usb/usb-gadget-don-t-save-bind-callback-in-struct-usb_composite_driver.patch b/usb/usb-gadget-don-t-save-bind-callback-in-struct-usb_composite_driver.patch index 779a690b66869c..7acafd62337a40 100644 --- a/usb/usb-gadget-don-t-save-bind-callback-in-struct-usb_composite_driver.patch +++ b/usb/usb-gadget-don-t-save-bind-callback-in-struct-usb_composite_driver.patch @@ -15,7 +15,6 @@ This fixes many section mismatches reported by modpost. Signed-off-by: Michał Nazarewicz <m.nazarewicz@samsung.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - --- drivers/usb/gadget/audio.c | 3 +-- drivers/usb/gadget/cdc2.c | 3 +-- @@ -25,11 +24,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/usb/gadget/hid.c | 3 +-- drivers/usb/gadget/mass_storage.c | 3 +-- drivers/usb/gadget/multi.c | 3 +-- + drivers/usb/gadget/nokia.c | 3 +-- drivers/usb/gadget/serial.c | 3 +-- drivers/usb/gadget/webcam.c | 3 +-- drivers/usb/gadget/zero.c | 3 +-- include/linux/usb/composite.h | 19 +++++-------------- - 12 files changed, 26 insertions(+), 38 deletions(-) + 13 files changed, 27 insertions(+), 40 deletions(-) --- a/drivers/usb/gadget/audio.c +++ b/drivers/usb/gadget/audio.c @@ -216,6 +216,23 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } module_init(multi_init); +--- a/drivers/usb/gadget/nokia.c ++++ b/drivers/usb/gadget/nokia.c +@@ -241,13 +241,12 @@ static struct usb_composite_driver nokia + .name = "g_nokia", + .dev = &device_desc, + .strings = dev_strings, +- .bind = nokia_bind, + .unbind = __exit_p(nokia_unbind), + }; + + static int __init nokia_init(void) + { +- return usb_composite_register(&nokia_driver); ++ return usb_composite_probe(&nokia_driver, nokia_bind); + } + module_init(nokia_init); + --- a/drivers/usb/gadget/serial.c +++ b/drivers/usb/gadget/serial.c @@ -242,7 +242,6 @@ static struct usb_composite_driver gseri |