Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / usb / serial / mct_u232.c

diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
index 50b6369..35bd29b 100644 (file)
--- a/drivers/usb/serial/mct_u232.c
+++ b/drivers/usb/serial/mct_u232.c
@@ -125,17 +125,19 @@ static struct usb_device_id id_table_combined [] = {
 MODULE_DEVICE_TABLE (usb, id_table_combined);
 
 static struct usb_driver mct_u232_driver = {
-       .owner =        THIS_MODULE,
        .name =         "mct_u232",
        .probe =        usb_serial_probe,
        .disconnect =   usb_serial_disconnect,
        .id_table =     id_table_combined,
+       .no_dynamic_id =        1,
 };
 
-static struct usb_serial_device_type mct_u232_device = {
-       .owner =             THIS_MODULE,
-       .name =              "MCT U232",
-       .short_name =        "mct_u232",
+static struct usb_serial_driver mct_u232_device = {
+       .driver = {
+               .owner =        THIS_MODULE,
+               .name =         "mct_u232",
+       },
+       .description =       "MCT U232",
        .id_table =          id_table_combined,
        .num_interrupt_in =  2,
        .num_bulk_in =       0,
@@ -346,10 +348,9 @@ static int mct_u232_startup (struct usb_serial *serial)
        struct mct_u232_private *priv;
        struct usb_serial_port *port, *rport;
 
-       priv = kmalloc(sizeof(struct mct_u232_private), GFP_KERNEL);
+       priv = kzalloc(sizeof(struct mct_u232_private), GFP_KERNEL);
        if (!priv)
                return -ENOMEM;
-       memset(priv, 0, sizeof(struct mct_u232_private));
        spin_lock_init(&priv->lock);
        usb_set_serial_port_data(serial->port[0], priv);