aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWu Fengguang <fengguang.wu@intel.com>2009-08-01 06:46:46 -0400
committerTakashi Iwai <tiwai@suse.de>2009-08-03 02:26:23 -0400
commita678cdee25a387c8fc3b2754974695412baf1d85 (patch)
tree77363880dead9748b8072ac31a571be7a9270c5c
parentdeadff1665491afce124a8ff83f00f784161f660 (diff)
ALSA: hda: take cmd_mutex in probe_codec()
Now that each codec will have its own module, it is possible for the user to load one codec while another one is running. So cmd_mutex would be a safe addition to probe_codec(). Signed-off-by: Wu Fengguang <fengguang.wu@intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/hda_intel.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 19e67a1b6026..ddabc827ac44 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1275,10 +1275,12 @@ static int probe_codec(struct azx *chip, int addr)
1275 (AC_VERB_PARAMETERS << 8) | AC_PAR_VENDOR_ID; 1275 (AC_VERB_PARAMETERS << 8) | AC_PAR_VENDOR_ID;
1276 unsigned int res; 1276 unsigned int res;
1277 1277
1278 mutex_lock(&chip->bus->cmd_mutex);
1278 chip->probing = 1; 1279 chip->probing = 1;
1279 azx_send_cmd(chip->bus, cmd); 1280 azx_send_cmd(chip->bus, cmd);
1280 res = azx_get_response(chip->bus, addr); 1281 res = azx_get_response(chip->bus, addr);
1281 chip->probing = 0; 1282 chip->probing = 0;
1283 mutex_unlock(&chip->bus->cmd_mutex);
1282 if (res == -1) 1284 if (res == -1)
1283 return -EIO; 1285 return -EIO;
1284 snd_printdd(SFX "codec #%d probed OK\n", addr); 1286 snd_printdd(SFX "codec #%d probed OK\n", addr);