From 0bf80f56b3dc2d354f40b74e65d6d97e8f04ac38 Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Sat, 27 Aug 2011 16:45:28 +0200 Subject: [PATCH] --- yaml --- r: 270441 b: refs/heads/master c: a0978e8039f1b1bfb9fbc68f682b14313bb4f9ad h: refs/heads/master i: 270439: caa02f77d33cc24a7d1d05e67b6c0759c4f95c26 v: v3 --- [refs] | 2 +- trunk/sound/firewire/speakers.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 224eeda71fc3..98a938d09a0c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb690c9e2702e49af3be2fb6f03d9b60e0afcab7 +refs/heads/master: a0978e8039f1b1bfb9fbc68f682b14313bb4f9ad diff --git a/trunk/sound/firewire/speakers.c b/trunk/sound/firewire/speakers.c index 3fc257da180c..cbe6bb9e53b6 100644 --- a/trunk/sound/firewire/speakers.c +++ b/trunk/sound/firewire/speakers.c @@ -778,9 +778,10 @@ static int __devexit fwspk_remove(struct device *dev) { struct fwspk *fwspk = dev_get_drvdata(dev); - mutex_lock(&fwspk->mutex); amdtp_out_stream_pcm_abort(&fwspk->stream); snd_card_disconnect(fwspk->card); + + mutex_lock(&fwspk->mutex); fwspk_stop_stream(fwspk); mutex_unlock(&fwspk->mutex); @@ -796,8 +797,8 @@ static void fwspk_bus_reset(struct fw_unit *unit) fcp_bus_reset(fwspk->unit); if (cmp_connection_update(&fwspk->connection) < 0) { - mutex_lock(&fwspk->mutex); amdtp_out_stream_pcm_abort(&fwspk->stream); + mutex_lock(&fwspk->mutex); fwspk_stop_stream(fwspk); mutex_unlock(&fwspk->mutex); return;