[PATCH] USB Serial: get rid of the .owner field in usb_serial_driver

[deliverable/linux.git] / drivers / usb / serial / generic.c

diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index ddde5fb13f6b33a9003cebcd94a118ee1f37d821..779bea0c6242dc575edbda7600c97b34e0813a1b 100644 (file)
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -36,8 +36,10 @@ MODULE_PARM_DESC(product, "User specified USB idProduct");
 static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */
 
 /* All of the device info needed for the Generic Serial Converter */
-struct usb_serial_device_type usb_serial_generic_device = {
-       .owner =                THIS_MODULE,
+struct usb_serial_driver usb_serial_generic_device = {
+       .driver = {
+               .owner =        THIS_MODULE,
+       },
        .name =                 "Generic",
        .short_name =           "generic",
        .id_table =             generic_device_ids,
@@ -223,7 +225,7 @@ int usb_serial_generic_write_room (struct usb_serial_port *port)
        dbg("%s - port %d", __FUNCTION__, port->number);
 
        if (serial->num_bulk_out) {
-               if (port->write_urb_busy)
+               if (!(port->write_urb_busy))
                        room = port->bulk_out_size;
        }