summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorMatthias Urlichs <smurf@smurf.noris.de>2006-08-02 16:41:41 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-08-02 16:41:41 -0700
commit02b2ac5b0370b1157a5a99f2fdf006644b9b86d5 (patch)
tree097b3fcfceff7b4d68d008e1b8d0facd98a14c6d /drivers/usb
parentb3fdab59b8f5d8e42fa339be74cd015dc1a3192f (diff)
downloadop-kernel-dev-02b2ac5b0370b1157a5a99f2fdf006644b9b86d5.zip
op-kernel-dev-02b2ac5b0370b1157a5a99f2fdf006644b9b86d5.tar.gz
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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 2a07945..283383d 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -128,7 +128,7 @@ static struct usb_driver option_driver = {
static struct usb_serial_driver option_3port_device = {
.driver = {
.owner = THIS_MODULE,
- .name = "option",
+ .name = "option3",
},
.description = "GSM modem (3-port)",
.id_table = option_ids3,
@@ -143,6 +143,7 @@ static struct usb_serial_driver option_3port_device = {
.chars_in_buffer = option_chars_in_buffer,
.throttle = option_rx_throttle,
.unthrottle = option_rx_unthrottle,
+ .ioctl = option_ioctl,
.set_termios = option_set_termios,
.break_ctl = option_break_ctl,
.tiocmget = option_tiocmget,
@@ -155,7 +156,7 @@ static struct usb_serial_driver option_3port_device = {
static struct usb_serial_driver option_1port_device = {
.driver = {
.owner = THIS_MODULE,
- .name = "option",
+ .name = "option1",
},
.description = "GSM modem (1-port)",
.id_table = option_ids1,
@@ -630,7 +631,6 @@ static void option_setup_urbs(struct usb_serial *serial)
dbg("%s", __FUNCTION__);
-
for (i = 0; i < serial->num_ports; i++) {
port = serial->port[i];
portdata = usb_get_serial_port_data(port);
OpenPOWER on IntegriCloud