Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[powerpc.git] / drivers / usb / serial / bus.c

diff --git a/drivers/usb/serial/bus.c b/drivers/usb/serial/bus.c
index 5a0bcd3..664139a 100644 (file)
--- a/drivers/usb/serial/bus.c
+++ b/drivers/usb/serial/bus.c
@@ -57,13 +57,13 @@ static int usb_serial_device_probe (struct device *dev)
 
        driver = port->serial->type;
        if (driver->port_probe) {
-               if (!try_module_get(driver->owner)) {
+               if (!try_module_get(driver->driver.owner)) {
                        dev_err(dev, "module get failed, exiting\n");
                        retval = -EIO;
                        goto exit;
                }
                retval = driver->port_probe (port);
-               module_put(driver->owner);
+               module_put(driver->driver.owner);
                if (retval)
                        goto exit;
        }
@@ -72,7 +72,7 @@ static int usb_serial_device_probe (struct device *dev)
        tty_register_device (usb_serial_tty_driver, minor, dev);
        dev_info(&port->serial->dev->dev, 
                 "%s converter now attached to ttyUSB%d\n",
-                driver->name, minor);
+                driver->description, minor);
 
 exit:
        return retval;
@@ -92,19 +92,19 @@ static int usb_serial_device_remove (struct device *dev)
 
        driver = port->serial->type;
        if (driver->port_remove) {
-               if (!try_module_get(driver->owner)) {
+               if (!try_module_get(driver->driver.owner)) {
                        dev_err(dev, "module get failed, exiting\n");
                        retval = -EIO;
                        goto exit;
                }
                retval = driver->port_remove (port);
-               module_put(driver->owner);
+               module_put(driver->driver.owner);
        }
 exit:
        minor = port->number;
        tty_unregister_device (usb_serial_tty_driver, minor);
        dev_info(dev, "%s converter now disconnected from ttyUSB%d\n",
-                driver->name, minor);
+                driver->description, minor);
 
        return retval;
 }
@@ -113,14 +113,9 @@ int usb_serial_bus_register(struct usb_serial_driver *driver)
 {
        int retval;
 
-       if (driver->short_name)
-               driver->driver.name = (char *)driver->short_name;
-       else
-               driver->driver.name = (char *)driver->name;
        driver->driver.bus = &usb_serial_bus_type;
        driver->driver.probe = usb_serial_device_probe;
        driver->driver.remove = usb_serial_device_remove;
-       driver->driver.owner = driver->owner;
 
        retval = driver_register(&driver->driver);