aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/u_serial.c
diff options
context:
space:
mode:
authorBenoit Goby <benoit@android.com>2012-05-10 04:08:01 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-10 15:26:17 -0400
commitc3c04b2945eccd8cdc07bbede3090c18dfed43c0 (patch)
tree1068ef2f091fb89aa3664f94b92168ec4897a023 /drivers/usb/gadget/u_serial.c
parentcad4cd8fbde6b2f45b51711260343b3195615c79 (diff)
usb: gadget: u_serial: Allow calling gserial_setup after init
Remove geserial_setup from the init section. The android gadget driver calls it after probe, after userspace has configured the gadget driver. Signed-off-by: Benoit Goby <benoit@android.com> Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Michal Nazarewicz <mina86@mina86.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/gadget/u_serial.c')
-rw-r--r--drivers/usb/gadget/u_serial.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c
index 6c23938d271..380a87f6e56 100644
--- a/drivers/usb/gadget/u_serial.c
+++ b/drivers/usb/gadget/u_serial.c
@@ -1025,7 +1025,7 @@ static const struct tty_operations gs_tty_ops = {
1025 1025
1026static struct tty_driver *gs_tty_driver; 1026static struct tty_driver *gs_tty_driver;
1027 1027
1028static int __init 1028static int
1029gs_port_alloc(unsigned port_num, struct usb_cdc_line_coding *coding) 1029gs_port_alloc(unsigned port_num, struct usb_cdc_line_coding *coding)
1030{ 1030{
1031 struct gs_port *port; 1031 struct gs_port *port;
@@ -1071,7 +1071,7 @@ gs_port_alloc(unsigned port_num, struct usb_cdc_line_coding *coding)
1071 * 1071 *
1072 * Returns negative errno or zero. 1072 * Returns negative errno or zero.
1073 */ 1073 */
1074int __init gserial_setup(struct usb_gadget *g, unsigned count) 1074int gserial_setup(struct usb_gadget *g, unsigned count)
1075{ 1075{
1076 unsigned i; 1076 unsigned i;
1077 struct usb_cdc_line_coding coding; 1077 struct usb_cdc_line_coding coding;