diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2011-08-27 18:05:15 (GMT) |
---|---|---|
committer | Clemens Ladisch <clemens@ladisch.de> | 2013-10-20 20:07:57 (GMT) |
commit | a8c558f6a3eedfb9bfd7d9d82f9d00f2f807ce7c (patch) | |
tree | a9227b68ee4e89615c6fb973e94b55a5ec75032a /sound/firewire | |
parent | 8709f1e4d68b0b3caf9783cf2463e5747943bff8 (diff) | |
download | linux-a8c558f6a3eedfb9bfd7d9d82f9d00f2f807ce7c.tar.xz |
ALSA: dice: fix locking
Avoid a lock inversion between dice->mutex and pcm->open_mutex.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'sound/firewire')
-rw-r--r-- | sound/firewire/dice.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/firewire/dice.c b/sound/firewire/dice.c index 2d198ae..2d3a04e 100644 --- a/sound/firewire/dice.c +++ b/sound/firewire/dice.c @@ -981,12 +981,12 @@ static void dice_remove(struct fw_unit *unit) { struct dice *dice = dev_get_drvdata(&unit->device); - mutex_lock(&dice->mutex); - amdtp_out_stream_pcm_abort(&dice->stream); snd_card_disconnect(dice->card); + mutex_lock(&dice->mutex); + dice_stream_stop(dice); dice_owner_clear(dice); @@ -999,8 +999,6 @@ static void dice_bus_reset(struct fw_unit *unit) { struct dice *dice = dev_get_drvdata(&unit->device); - mutex_lock(&dice->mutex); - /* * On a bus reset, the DICE firmware disables streaming and then goes * off contemplating its own navel for hundreds of milliseconds before @@ -1011,6 +1009,8 @@ static void dice_bus_reset(struct fw_unit *unit) */ amdtp_out_stream_pcm_abort(&dice->stream); + mutex_lock(&dice->mutex); + dice->global_enabled = false; dice_stream_stop_packets(dice); |