diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-11-16 11:33:35 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-11-16 11:33:35 +0100 |
| commit | 7d1794e81b5f202c73d7e3e65f0ee7aae4928038 (patch) | |
| tree | 3c3e9d8abe03a3b7f1702726bbc589bbd68bdfd9 /sound/pci/hda/hda_intel.c | |
| parent | 01a1796bc52f625edc23bf995d200e1556eec544 (diff) | |
| parent | 8ef5837a47f73faee18fa7ce2f9a9eb7675be8de (diff) | |
| download | op-kernel-dev-7d1794e81b5f202c73d7e3e65f0ee7aae4928038.zip op-kernel-dev-7d1794e81b5f202c73d7e3e65f0ee7aae4928038.tar.gz | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 0d3e0c9..e73e395 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -722,9 +722,10 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus, chip->last_cmd[addr]); chip->single_cmd = 1; bus->response_reset = 0; - /* re-initialize CORB/RIRB */ + /* release CORB/RIRB */ azx_free_cmd_io(chip); - azx_init_cmd_io(chip); + /* disable unsolicited responses */ + azx_writel(chip, GCTL, azx_readl(chip, GCTL) & ~ICH6_GCTL_UNSOL); return -1; } @@ -865,7 +866,9 @@ static int azx_reset(struct azx *chip) } /* Accept unsolicited responses */ - azx_writel(chip, GCTL, azx_readl(chip, GCTL) | ICH6_GCTL_UNSOL); + if (!chip->single_cmd) + azx_writel(chip, GCTL, azx_readl(chip, GCTL) | + ICH6_GCTL_UNSOL); /* detect codecs */ if (!chip->codec_mask) { @@ -980,7 +983,8 @@ static void azx_init_chip(struct azx *chip) azx_int_enable(chip); /* initialize the codec command I/O */ - azx_init_cmd_io(chip); + if (!chip->single_cmd) + azx_init_cmd_io(chip); /* program the position buffer */ azx_writel(chip, DPLBASE, (u32)chip->posbuf.addr); |
