diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-27 20:15:16 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-27 20:15:16 +0200 |
| commit | 722b262c966a388a1f8bfcdd100cd19c4ce59ab9 (patch) | |
| tree | 34e755b07dbca16f65ad7eb5bb1fade06032cebf /drivers/usb/class | |
| parent | drivers: usb: fsl: Define usb control register mask for w1c bits (diff) | |
| parent | Linux 4.2-rc4 (diff) | |
| download | linux-722b262c966a388a1f8bfcdd100cd19c4ce59ab9.tar.xz linux-722b262c966a388a1f8bfcdd100cd19c4ce59ab9.zip | |
Merge 4.2-rc4 into usb-next
We want the USB fixes that went into that release in this branch as
well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/class')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 519a77ba214c..b30e7423549b 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1944,6 +1944,7 @@ static void __exit acm_exit(void) usb_deregister(&acm_driver); tty_unregister_driver(acm_tty_driver); put_tty_driver(acm_tty_driver); + idr_destroy(&acm_minors); } module_init(acm_init); |