summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_intel.c
diff options
context:
space:
mode:
authorTakashi Iwai2015-04-14 22:06:53 +0200
committerTakashi Iwai2015-04-16 07:37:02 +0200
commitccc98865aa44184e34de8df96dc837726c978949 (patch)
treed8677756b970002c378269c56a1b6313599ea743 /sound/pci/hda/hda_intel.c
parentALSA: hda - Migrate hdac_stream into legacy driver (diff)
downloadkernel-qcow2-linux-ccc98865aa44184e34de8df96dc837726c978949.tar.gz
kernel-qcow2-linux-ccc98865aa44184e34de8df96dc837726c978949.tar.xz
kernel-qcow2-linux-ccc98865aa44184e34de8df96dc837726c978949.zip
ALSA: hda - Migrate more hdac_stream codes
... including dsp loader helpers. Lots of codes removed. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
-rw-r--r--sound/pci/hda/hda_intel.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index c440ac1e34c8..a55d8504fe00 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -568,6 +568,9 @@ static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev)
dev_info(chip->card->dev,
"Invalid position buffer, using LPIB read method instead.\n");
chip->get_position[stream] = azx_get_pos_lpib;
+ if (chip->get_position[0] == azx_get_pos_lpib &&
+ chip->get_position[1] == azx_get_pos_lpib)
+ azx_bus(chip)->use_posbuf = false;
pos = azx_get_pos_lpib(chip, azx_dev);
chip->get_delay[stream] = NULL;
} else {
@@ -1477,6 +1480,7 @@ static int azx_first_init(struct azx *chip)
dev_err(card->dev, "ioremap error\n");
return -ENXIO;
}
+ azx_bus(chip)->remap_addr = chip->remap_addr; /* FIXME */
if (chip->msi) {
if (chip->driver_caps & AZX_DCAPS_NO_MSI64) {