diff options
author | Johannes Hölzl <johannes.hoelzl@gmx.de> | 2006-12-17 15:50:24 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-07 18:44:34 -0500 |
commit | d9b1b787736852f462dbf277b3ca708cbbf693ae (patch) | |
tree | 143d154a3f77bb3aff27fb74eed339f2713ed399 /drivers/usb/serial/mos7720.c | |
parent | 93bacefc4cc0b53e1cb6a336d43847154fdf6886 (diff) |
USB serial: add driver pointer to all usb-serial drivers
Every usb serial driver should have a pointer to the corresponding usb driver.
So the usb serial core can add a new id not only to the usb serial driver, but
also to the usb driver.
Also the usb drivers of ark3116, mos7720 and mos7840 missed the flag
no_dynamic_id=1. This is added now.
Signed-off-by: Johannes Hölzl <johannes.hoelzl@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/mos7720.c')
-rw-r--r-- | drivers/usb/serial/mos7720.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c index e55f4ed81d7b..6109c6704a73 100644 --- a/drivers/usb/serial/mos7720.c +++ b/drivers/usb/serial/mos7720.c | |||
@@ -1605,12 +1605,21 @@ static void mos7720_shutdown(struct usb_serial *serial) | |||
1605 | usb_set_serial_data(serial, NULL); | 1605 | usb_set_serial_data(serial, NULL); |
1606 | } | 1606 | } |
1607 | 1607 | ||
1608 | static struct usb_driver usb_driver = { | ||
1609 | .name = "moschip7720", | ||
1610 | .probe = usb_serial_probe, | ||
1611 | .disconnect = usb_serial_disconnect, | ||
1612 | .id_table = moschip_port_id_table, | ||
1613 | .no_dynamic_id = 1, | ||
1614 | }; | ||
1615 | |||
1608 | static struct usb_serial_driver moschip7720_2port_driver = { | 1616 | static struct usb_serial_driver moschip7720_2port_driver = { |
1609 | .driver = { | 1617 | .driver = { |
1610 | .owner = THIS_MODULE, | 1618 | .owner = THIS_MODULE, |
1611 | .name = "moschip7720", | 1619 | .name = "moschip7720", |
1612 | }, | 1620 | }, |
1613 | .description = "Moschip 2 port adapter", | 1621 | .description = "Moschip 2 port adapter", |
1622 | .usb_driver = &usb_driver, | ||
1614 | .id_table = moschip_port_id_table, | 1623 | .id_table = moschip_port_id_table, |
1615 | .num_interrupt_in = 1, | 1624 | .num_interrupt_in = 1, |
1616 | .num_bulk_in = 2, | 1625 | .num_bulk_in = 2, |
@@ -1631,13 +1640,6 @@ static struct usb_serial_driver moschip7720_2port_driver = { | |||
1631 | .read_bulk_callback = mos7720_bulk_in_callback, | 1640 | .read_bulk_callback = mos7720_bulk_in_callback, |
1632 | }; | 1641 | }; |
1633 | 1642 | ||
1634 | static struct usb_driver usb_driver = { | ||
1635 | .name = "moschip7720", | ||
1636 | .probe = usb_serial_probe, | ||
1637 | .disconnect = usb_serial_disconnect, | ||
1638 | .id_table = moschip_port_id_table, | ||
1639 | }; | ||
1640 | |||
1641 | static int __init moschip7720_init(void) | 1643 | static int __init moschip7720_init(void) |
1642 | { | 1644 | { |
1643 | int retval; | 1645 | int retval; |