Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 17:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: dice: fix locking

Browse Source 
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>
This commit is contained in:
Stefan Richter 2011-08-27 20:05:15 +02:00 committed by Clemens Ladisch
parent 8709f1e4d6
commit a8c558f6a3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/firewire/dice.c
View File

@ -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);