50 lines
1.4 KiB
Diff
50 lines
1.4 KiB
Diff
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Date: Mon, 23 Apr 2012 16:11:26 -0700
|
|
Subject: [023/106] Staging: line6: remove teardown code from module_exit path
|
|
|
|
commit 15a89dc83bad5c22a02bd292cf87d72dacb7dcb3 upstream.
|
|
|
|
These pcm values should all be stopped properly when the device is
|
|
removed from the system (i.e. when disconnect is called), so there's no
|
|
need to duplicate this when the module is unloaded as well.
|
|
|
|
CC: Markus Grabner <grabner@icg.tugraz.at>
|
|
CC: Stefan Hajnoczi <stefanha@gmail.com>
|
|
CC: Julia Lawall <julia@diku.dk>
|
|
CC: Dan Carpenter <dan.carpenter@oracle.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/staging/line6/driver.c | 19 -------------------
|
|
1 file changed, 19 deletions(-)
|
|
|
|
diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
|
|
index 351e860..c476fcc 100644
|
|
--- a/drivers/staging/line6/driver.c
|
|
+++ b/drivers/staging/line6/driver.c
|
|
@@ -1315,25 +1315,6 @@ static int __init line6_init(void)
|
|
*/
|
|
static void __exit line6_exit(void)
|
|
{
|
|
- int i;
|
|
- struct usb_line6 *line6;
|
|
- struct snd_line6_pcm *line6pcm;
|
|
-
|
|
- /* stop all PCM channels */
|
|
- for (i = LINE6_MAX_DEVICES; i--;) {
|
|
- line6 = line6_devices[i];
|
|
-
|
|
- if (line6 == NULL)
|
|
- continue;
|
|
-
|
|
- line6pcm = line6->line6pcm;
|
|
-
|
|
- if (line6pcm == NULL)
|
|
- continue;
|
|
-
|
|
- line6_pcm_release(line6pcm, ~0);
|
|
- }
|
|
-
|
|
usb_deregister(&line6_driver);
|
|
}
|
|
|