diff options
author | Daniel Mack <daniel@caiaq.de> | 2008-04-14 09:39:14 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 06:00:35 -0400 |
commit | 8d048841e822f745187246a036d03f2793739b7f (patch) | |
tree | 0ea6afcd5cdb817c40c9877b5f9a19982ca7afd2 /sound/usb/caiaq/caiaq-device.c | |
parent | f57ab97e767d293132a29a43ca3ecb0f73f1d5bb (diff) |
[ALSA] snd_usb_caiaq: fix potential lockups locking
This patch fixes potential lockups in snd_usb_caiaq by refining the
locking mechanims and by using usb_kill_urb() in favor to
usb_unlink_urb().
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/caiaq/caiaq-device.c')
-rw-r--r-- | sound/usb/caiaq/caiaq-device.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/caiaq/caiaq-device.c b/sound/usb/caiaq/caiaq-device.c index 7c44a2c7f963..73c08b40cc5f 100644 --- a/sound/usb/caiaq/caiaq-device.c +++ b/sound/usb/caiaq/caiaq-device.c | |||
@@ -42,7 +42,7 @@ | |||
42 | #endif | 42 | #endif |
43 | 43 | ||
44 | MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>"); | 44 | MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>"); |
45 | MODULE_DESCRIPTION("caiaq USB audio, version 1.3.2"); | 45 | MODULE_DESCRIPTION("caiaq USB audio, version 1.3.4"); |
46 | MODULE_LICENSE("GPL"); | 46 | MODULE_LICENSE("GPL"); |
47 | MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2}," | 47 | MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2}," |
48 | "{Native Instruments, RigKontrol3}," | 48 | "{Native Instruments, RigKontrol3}," |
@@ -456,7 +456,7 @@ static void snd_disconnect(struct usb_interface *intf) | |||
456 | struct snd_usb_caiaqdev *dev; | 456 | struct snd_usb_caiaqdev *dev; |
457 | struct snd_card *card = dev_get_drvdata(&intf->dev); | 457 | struct snd_card *card = dev_get_drvdata(&intf->dev); |
458 | 458 | ||
459 | debug("snd_disconnect(%p)\n", intf); | 459 | debug("%s(%p)\n", __func__, intf); |
460 | 460 | ||
461 | if (!card) | 461 | if (!card) |
462 | return; | 462 | return; |