diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-08-03 02:37:17 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-08-03 02:37:17 -0400 |
| commit | e44d4e4cee1ece7b6e6bf4db899b1a7766015306 (patch) | |
| tree | 791adda61e8affa6f2cc39485cbc6b5e8d4d41ed /sound/pci/hda/hda_codec.c | |
| parent | 559059b27f1768e89adc204f3ba2cb82882c15ca (diff) | |
| parent | 4b35d2ca2307d40ccb6b3b6f9cc25ac9178b2a6c (diff) | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index a23c27d2fb2f..24401d5d3511 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c | |||
| @@ -185,7 +185,7 @@ static int codec_exec_verb(struct hda_codec *codec, unsigned int cmd, | |||
| 185 | mutex_lock(&bus->cmd_mutex); | 185 | mutex_lock(&bus->cmd_mutex); |
| 186 | err = bus->ops.command(bus, cmd); | 186 | err = bus->ops.command(bus, cmd); |
| 187 | if (!err && res) | 187 | if (!err && res) |
| 188 | *res = bus->ops.get_response(bus); | 188 | *res = bus->ops.get_response(bus, codec->addr); |
| 189 | mutex_unlock(&bus->cmd_mutex); | 189 | mutex_unlock(&bus->cmd_mutex); |
| 190 | snd_hda_power_down(codec); | 190 | snd_hda_power_down(codec); |
| 191 | if (res && *res == -1 && bus->rirb_error) { | 191 | if (res && *res == -1 && bus->rirb_error) { |