From 7ce8b5978bb56d95020954f28ed270755eacd79c Mon Sep 17 00:00:00 2001 From: Clemens Ladisch Date: Wed, 11 May 2011 10:53:12 +0200 Subject: [PATCH] --- yaml --- r: 248175 b: refs/heads/master c: aee70400184b6a8d39243b02c244aed61259a46b h: refs/heads/master i: 248173: 07771298354664e50d3fdf464a8259d8f0e8e66f 248171: 0e4a4282d61d554ce43c9e4f454fe60b56ad182b 248167: 3bc33e85518736a5f117ab713137205271386eef 248159: 6142dff048854db5ec4a7144b12bb74adf70b6ab v: v3 --- [refs] | 2 +- trunk/sound/firewire/isight.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c1077fff4394..03c3f0ea2596 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac34dad26e6786257ef54d8df4f883825bea02eb +refs/heads/master: aee70400184b6a8d39243b02c244aed61259a46b diff --git a/trunk/sound/firewire/isight.c b/trunk/sound/firewire/isight.c index 4d2edcfdbbca..96267437d373 100644 --- a/trunk/sound/firewire/isight.c +++ b/trunk/sound/firewire/isight.c @@ -692,10 +692,9 @@ static int isight_remove(struct device *dev) { struct isight *isight = dev_get_drvdata(dev); - snd_card_disconnect(isight->card); - mutex_lock(&isight->mutex); isight_pcm_abort(isight); + snd_card_disconnect(isight->card); isight_stop_streaming(isight); mutex_unlock(&isight->mutex);