Merge 3.9-rc4 into usb-next
This picks up the fixes we had for USB in 3.9-rc4 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
commit
2849a3a945
338 changed files with 3385 additions and 1691 deletions
|
@ -151,6 +151,7 @@ static void destroy_serial(struct kref *kref)
|
|||
}
|
||||
}
|
||||
|
||||
usb_put_intf(serial->interface);
|
||||
usb_put_dev(serial->dev);
|
||||
kfree(serial);
|
||||
}
|
||||
|
@ -616,7 +617,7 @@ static struct usb_serial *create_serial(struct usb_device *dev,
|
|||
}
|
||||
serial->dev = usb_get_dev(dev);
|
||||
serial->type = driver;
|
||||
serial->interface = interface;
|
||||
serial->interface = usb_get_intf(interface);
|
||||
kref_init(&serial->kref);
|
||||
mutex_init(&serial->disc_mutex);
|
||||
serial->minor = SERIAL_TTY_NO_MINOR;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue