ALSA: firewire-speakers: fix locking
There is a lock inversion between fwspk->mutex and pcm->open_mutex
reported by lockdep when fwspk_hw_free is called.
Fixed by copying the fix from the same former issue in the isight
sound driver (commit f3f7c1837f
"ALSA: isight: fix locking").
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
bb690c9e27
commit
a0978e8039
@ -778,9 +778,10 @@ static int __devexit fwspk_remove(struct device *dev)
|
|||||||
{
|
{
|
||||||
struct fwspk *fwspk = dev_get_drvdata(dev);
|
struct fwspk *fwspk = dev_get_drvdata(dev);
|
||||||
|
|
||||||
mutex_lock(&fwspk->mutex);
|
|
||||||
amdtp_out_stream_pcm_abort(&fwspk->stream);
|
amdtp_out_stream_pcm_abort(&fwspk->stream);
|
||||||
snd_card_disconnect(fwspk->card);
|
snd_card_disconnect(fwspk->card);
|
||||||
|
|
||||||
|
mutex_lock(&fwspk->mutex);
|
||||||
fwspk_stop_stream(fwspk);
|
fwspk_stop_stream(fwspk);
|
||||||
mutex_unlock(&fwspk->mutex);
|
mutex_unlock(&fwspk->mutex);
|
||||||
|
|
||||||
@ -796,8 +797,8 @@ static void fwspk_bus_reset(struct fw_unit *unit)
|
|||||||
fcp_bus_reset(fwspk->unit);
|
fcp_bus_reset(fwspk->unit);
|
||||||
|
|
||||||
if (cmp_connection_update(&fwspk->connection) < 0) {
|
if (cmp_connection_update(&fwspk->connection) < 0) {
|
||||||
mutex_lock(&fwspk->mutex);
|
|
||||||
amdtp_out_stream_pcm_abort(&fwspk->stream);
|
amdtp_out_stream_pcm_abort(&fwspk->stream);
|
||||||
|
mutex_lock(&fwspk->mutex);
|
||||||
fwspk_stop_stream(fwspk);
|
fwspk_stop_stream(fwspk);
|
||||||
mutex_unlock(&fwspk->mutex);
|
mutex_unlock(&fwspk->mutex);
|
||||||
return;
|
return;
|
||||||
|
Loading…
Reference in New Issue
Block a user