diff options
author | Matthias Urlichs <smurf@smurf.noris.de> | 2006-08-02 19:41:41 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-02 19:41:41 -0400 |
commit | 02b2ac5b0370b1157a5a99f2fdf006644b9b86d5 (patch) | |
tree | 097b3fcfceff7b4d68d008e1b8d0facd98a14c6d /drivers/usb | |
parent | b3fdab59b8f5d8e42fa339be74cd015dc1a3192f (diff) |
USB: Option driver: Short driver names were identical
The short driver names were not unique,
which prevented the driver from actually loading.
Also, one of the ioctl pointers was missing.
Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/serial/option.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index 2a07945c4232..283383df130d 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c | |||
@@ -128,7 +128,7 @@ static struct usb_driver option_driver = { | |||
128 | static struct usb_serial_driver option_3port_device = { | 128 | static struct usb_serial_driver option_3port_device = { |
129 | .driver = { | 129 | .driver = { |
130 | .owner = THIS_MODULE, | 130 | .owner = THIS_MODULE, |
131 | .name = "option", | 131 | .name = "option3", |
132 | }, | 132 | }, |
133 | .description = "GSM modem (3-port)", | 133 | .description = "GSM modem (3-port)", |
134 | .id_table = option_ids3, | 134 | .id_table = option_ids3, |
@@ -143,6 +143,7 @@ static struct usb_serial_driver option_3port_device = { | |||
143 | .chars_in_buffer = option_chars_in_buffer, | 143 | .chars_in_buffer = option_chars_in_buffer, |
144 | .throttle = option_rx_throttle, | 144 | .throttle = option_rx_throttle, |
145 | .unthrottle = option_rx_unthrottle, | 145 | .unthrottle = option_rx_unthrottle, |
146 | .ioctl = option_ioctl, | ||
146 | .set_termios = option_set_termios, | 147 | .set_termios = option_set_termios, |
147 | .break_ctl = option_break_ctl, | 148 | .break_ctl = option_break_ctl, |
148 | .tiocmget = option_tiocmget, | 149 | .tiocmget = option_tiocmget, |
@@ -155,7 +156,7 @@ static struct usb_serial_driver option_3port_device = { | |||
155 | static struct usb_serial_driver option_1port_device = { | 156 | static struct usb_serial_driver option_1port_device = { |
156 | .driver = { | 157 | .driver = { |
157 | .owner = THIS_MODULE, | 158 | .owner = THIS_MODULE, |
158 | .name = "option", | 159 | .name = "option1", |
159 | }, | 160 | }, |
160 | .description = "GSM modem (1-port)", | 161 | .description = "GSM modem (1-port)", |
161 | .id_table = option_ids1, | 162 | .id_table = option_ids1, |
@@ -630,7 +631,6 @@ static void option_setup_urbs(struct usb_serial *serial) | |||
630 | 631 | ||
631 | dbg("%s", __FUNCTION__); | 632 | dbg("%s", __FUNCTION__); |
632 | 633 | ||
633 | |||
634 | for (i = 0; i < serial->num_ports; i++) { | 634 | for (i = 0; i < serial->num_ports; i++) { |
635 | port = serial->port[i]; | 635 | port = serial->port[i]; |
636 | portdata = usb_get_serial_port_data(port); | 636 | portdata = usb_get_serial_port_data(port); |