ChangeSet 1.942, 2003/01/15 14:50:56-08:00, [EMAIL PROTECTED]

USB: added .owner for USB drivers that have a struct tty_driver


diff -Nru a/drivers/usb/class/bluetty.c b/drivers/usb/class/bluetty.c
--- a/drivers/usb/class/bluetty.c       Wed Jan 15 14:57:45 2003
+++ b/drivers/usb/class/bluetty.c       Wed Jan 15 14:57:45 2003
@@ -1107,20 +1107,17 @@
                return -EIO;
        }
 
-       MOD_INC_USE_COUNT;
        info("USB Bluetooth converter detected");
 
        for (minor = 0; minor < BLUETOOTH_TTY_MINORS && bluetooth_table[minor]; 
++minor)
                ;
        if (bluetooth_table[minor]) {
                err("No more free Bluetooth devices");
-               MOD_DEC_USE_COUNT;
                return -ENODEV;
        }
 
        if (!(bluetooth = kmalloc(sizeof(struct usb_bluetooth), GFP_KERNEL))) {
                err("Out of memory");
-               MOD_DEC_USE_COUNT;
                return -ENOMEM;
        }
 
@@ -1236,7 +1233,6 @@
 
        /* free up any memory that we allocated */
        kfree (bluetooth);
-       MOD_DEC_USE_COUNT;
        return -EIO;
 }
 
@@ -1295,13 +1291,12 @@
        } else {
                info("device disconnected");
        }
-
-       MOD_DEC_USE_COUNT;
 }
 
 
 static struct tty_driver bluetooth_tty_driver = {
        .magic =                TTY_DRIVER_MAGIC,
+       .owner =                THIS_MODULE,
        .driver_name =          "usb-bluetooth",
        .name =                 "usb/ttub/%d",
        .major =                BLUETOOTH_TTY_MAJOR,
diff -Nru a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
--- a/drivers/usb/class/cdc-acm.c       Wed Jan 15 14:57:45 2003
+++ b/drivers/usb/class/cdc-acm.c       Wed Jan 15 14:57:45 2003
@@ -320,8 +320,6 @@
        tty->driver_data = acm;
        acm->tty = tty;
 
-       MOD_INC_USE_COUNT;
-
         lock_kernel();
 
        if (acm->used++) {
@@ -369,7 +367,6 @@
                        kfree(acm);
                }
        }
-       MOD_DEC_USE_COUNT;
 }
 
 static int acm_tty_write(struct tty_struct *tty, int from_user, const unsigned char 
*buf, int count)
@@ -724,6 +721,7 @@
 
 static struct tty_driver acm_tty_driver = {
        .magic =                TTY_DRIVER_MAGIC,
+       .owner =                THIS_MODULE,
        .driver_name =          "acm",
        .name =                 "usb/acm/%d",
        .major =                ACM_TTY_MAJOR,
diff -Nru a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
--- a/drivers/usb/serial/usb-serial.c   Wed Jan 15 14:57:45 2003
+++ b/drivers/usb/serial/usb-serial.c   Wed Jan 15 14:57:45 2003
@@ -1257,6 +1257,7 @@
 
 struct tty_driver usb_serial_tty_driver = {
        .magic =                TTY_DRIVER_MAGIC,
+       .owner =                THIS_MODULE,
        .driver_name =          "usbserial",
 #ifndef CONFIG_DEVFS_FS
        .name =                 "ttyUSB",



-------------------------------------------------------
This SF.NET email is sponsored by: A Thawte Code Signing Certificate 
is essential in establishing user confidence by providing assurance of 
authenticity and code integrity. Download our Free Code Signing guide:
http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0028en
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel

Reply via email to