aboutsummaryrefslogtreecommitdiff
path: root/sound/firewire
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2011-05-11 11:07:09 +0200
committerTakashi Iwai <tiwai@suse.de>2011-05-11 14:53:09 +0200
commitf3f7c1837f6bcae3601fc535b339426868bf1549 (patch)
tree1baa013c8219969e65ee22d42ed4bb2293763195 /sound/firewire
parent3cabffd72c303c3b5bbbbe88c95b49043898d1f3 (diff)
downloadlinux-f3f7c1837f6bcae3601fc535b339426868bf1549.tar.gz
ALSA: isight: fix locking
Lockdep complains about conflicts between isight->mutex, ALSA's register_mutex, mm->mmap_sem, and pcm->open_mutex. This can be fixed by moving the calls to isight_pcm_abort(), snd_card_disconnect(), and fw_iso_resources_update() out of isight->mutex. These functions are designed to be called asynchronously; the mutex needs to protect only the device streaming state modified by isight_start/stop_streaming(). Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Reported-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
-rw-r--r--sound/firewire/isight.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/sound/firewire/isight.c b/sound/firewire/isight.c
index 96267437d37..86ee16ca365 100644
--- a/sound/firewire/isight.c
+++ b/sound/firewire/isight.c
@@ -692,9 +692,11 @@ static int isight_remove(struct device *dev)
{
struct isight *isight = dev_get_drvdata(dev);
- mutex_lock(&isight->mutex);
isight_pcm_abort(isight);
+
snd_card_disconnect(isight->card);
+
+ mutex_lock(&isight->mutex);
isight_stop_streaming(isight);
mutex_unlock(&isight->mutex);
@@ -707,12 +709,13 @@ static void isight_bus_reset(struct fw_unit *unit)
{
struct isight *isight = dev_get_drvdata(&unit->device);
- mutex_lock(&isight->mutex);
if (fw_iso_resources_update(&isight->resources) < 0) {
isight_pcm_abort(isight);
+
+ mutex_lock(&isight->mutex);
isight_stop_streaming(isight);
+ mutex_unlock(&isight->mutex);
}
- mutex_unlock(&isight->mutex);
}
static const struct ieee1394_device_id isight_id_table[] = {