Commit d2c44523 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

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

parent 078dfbd2
...@@ -1107,20 +1107,17 @@ static int usb_bluetooth_probe (struct usb_interface *intf, ...@@ -1107,20 +1107,17 @@ static int usb_bluetooth_probe (struct usb_interface *intf,
return -EIO; return -EIO;
} }
MOD_INC_USE_COUNT;
info("USB Bluetooth converter detected"); info("USB Bluetooth converter detected");
for (minor = 0; minor < BLUETOOTH_TTY_MINORS && bluetooth_table[minor]; ++minor) for (minor = 0; minor < BLUETOOTH_TTY_MINORS && bluetooth_table[minor]; ++minor)
; ;
if (bluetooth_table[minor]) { if (bluetooth_table[minor]) {
err("No more free Bluetooth devices"); err("No more free Bluetooth devices");
MOD_DEC_USE_COUNT;
return -ENODEV; return -ENODEV;
} }
if (!(bluetooth = kmalloc(sizeof(struct usb_bluetooth), GFP_KERNEL))) { if (!(bluetooth = kmalloc(sizeof(struct usb_bluetooth), GFP_KERNEL))) {
err("Out of memory"); err("Out of memory");
MOD_DEC_USE_COUNT;
return -ENOMEM; return -ENOMEM;
} }
...@@ -1236,7 +1233,6 @@ static int usb_bluetooth_probe (struct usb_interface *intf, ...@@ -1236,7 +1233,6 @@ static int usb_bluetooth_probe (struct usb_interface *intf,
/* free up any memory that we allocated */ /* free up any memory that we allocated */
kfree (bluetooth); kfree (bluetooth);
MOD_DEC_USE_COUNT;
return -EIO; return -EIO;
} }
...@@ -1295,13 +1291,12 @@ static void usb_bluetooth_disconnect(struct usb_interface *intf) ...@@ -1295,13 +1291,12 @@ static void usb_bluetooth_disconnect(struct usb_interface *intf)
} else { } else {
info("device disconnected"); info("device disconnected");
} }
MOD_DEC_USE_COUNT;
} }
static struct tty_driver bluetooth_tty_driver = { static struct tty_driver bluetooth_tty_driver = {
.magic = TTY_DRIVER_MAGIC, .magic = TTY_DRIVER_MAGIC,
.owner = THIS_MODULE,
.driver_name = "usb-bluetooth", .driver_name = "usb-bluetooth",
.name = "usb/ttub/%d", .name = "usb/ttub/%d",
.major = BLUETOOTH_TTY_MAJOR, .major = BLUETOOTH_TTY_MAJOR,
......
...@@ -320,8 +320,6 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp) ...@@ -320,8 +320,6 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp)
tty->driver_data = acm; tty->driver_data = acm;
acm->tty = tty; acm->tty = tty;
MOD_INC_USE_COUNT;
lock_kernel(); lock_kernel();
if (acm->used++) { if (acm->used++) {
...@@ -369,7 +367,6 @@ static void acm_tty_close(struct tty_struct *tty, struct file *filp) ...@@ -369,7 +367,6 @@ static void acm_tty_close(struct tty_struct *tty, struct file *filp)
kfree(acm); kfree(acm);
} }
} }
MOD_DEC_USE_COUNT;
} }
static int acm_tty_write(struct tty_struct *tty, int from_user, const unsigned char *buf, int 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 termios *acm_tty_termios_locked[ACM_TTY_MINORS]; ...@@ -724,6 +721,7 @@ static struct termios *acm_tty_termios_locked[ACM_TTY_MINORS];
static struct tty_driver acm_tty_driver = { static struct tty_driver acm_tty_driver = {
.magic = TTY_DRIVER_MAGIC, .magic = TTY_DRIVER_MAGIC,
.owner = THIS_MODULE,
.driver_name = "acm", .driver_name = "acm",
.name = "usb/acm/%d", .name = "usb/acm/%d",
.major = ACM_TTY_MAJOR, .major = ACM_TTY_MAJOR,
......
...@@ -1257,6 +1257,7 @@ void usb_serial_disconnect(struct usb_interface *interface) ...@@ -1257,6 +1257,7 @@ void usb_serial_disconnect(struct usb_interface *interface)
struct tty_driver usb_serial_tty_driver = { struct tty_driver usb_serial_tty_driver = {
.magic = TTY_DRIVER_MAGIC, .magic = TTY_DRIVER_MAGIC,
.owner = THIS_MODULE,
.driver_name = "usbserial", .driver_name = "usbserial",
#ifndef CONFIG_DEVFS_FS #ifndef CONFIG_DEVFS_FS
.name = "ttyUSB", .name = "ttyUSB",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment