iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

USB: Option driver: Short driver names were identical

Browse Source 
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>
This commit is contained in:
Matthias Urlichs 2006-08-02 16:41:41 -07:00 committed by Greg Kroah-Hartman
parent b3fdab59b8
commit 02b2ac5b03
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/usb/serial/option.c
View File

@ -128,7 +128,7 @@ static struct usb_driver option_driver = {
static struct usb_serial_driver option_3port_device = { static struct usb_serial_driver option_3port_device = {
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "option", .name = "option3",
}, },
.description = "GSM modem (3-port)", .description = "GSM modem (3-port)",
.id_table = option_ids3, .id_table = option_ids3,
@ -143,6 +143,7 @@ static struct usb_serial_driver option_3port_device = {
.chars_in_buffer = option_chars_in_buffer, .chars_in_buffer = option_chars_in_buffer,
.throttle = option_rx_throttle, .throttle = option_rx_throttle,
.unthrottle = option_rx_unthrottle, .unthrottle = option_rx_unthrottle,
.ioctl = option_ioctl,
.set_termios = option_set_termios, .set_termios = option_set_termios,
.break_ctl = option_break_ctl, .break_ctl = option_break_ctl,
.tiocmget = option_tiocmget, .tiocmget = option_tiocmget,
@ -155,7 +156,7 @@ static struct usb_serial_driver option_3port_device = {
static struct usb_serial_driver option_1port_device = { static struct usb_serial_driver option_1port_device = {
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "option", .name = "option1",
}, },
.description = "GSM modem (1-port)", .description = "GSM modem (1-port)",
.id_table = option_ids1, .id_table = option_ids1,
@ -630,7 +631,6 @@ static void option_setup_urbs(struct usb_serial *serial)
dbg("%s", __FUNCTION__); dbg("%s", __FUNCTION__);
for (i = 0; i < serial->num_ports; i++) { for (i = 0; i < serial->num_ports; i++) {
port = serial->port[i]; port = serial->port[i];
portdata = usb_get_serial_port_data(port); portdata = usb_get_serial_port_data(port);