diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-08-12 19:01:47 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-08-12 19:01:47 +0300 |
| commit | 7da20788d3ff59506aebd946d8a424f01f2c1c66 (patch) | |
| tree | ebebf848ede28a7ee23c5353d9709cee32547dac /sound/hda/hdac_stream.c | |
| parent | a2ef03fe617a8365fb7794531b11ba587509a9b9 (diff) | |
| download | linux-7da20788d3ff59506aebd946d8a424f01f2c1c66.tar.xz | |
ALSA: hda: Set fifo_size for both playback and capture streams
Currently we set hdac_stream.fifo_size field only for the playback
stream by some odd reason I forgot, while this field isn't referred in
any places. Actually this fifo_size field would have been required in
the position report correction for VIA chipset, but due to the lack of
the fifo_size set for capture streams, snd-hda-intel driver fetches
the register by itself.
This patch straightens and simplifies the code by setting the
fifo_size field for both playback and capture streams, and use it in
the HD-audio controller driver.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/hda/hdac_stream.c')
| -rw-r--r-- | sound/hda/hdac_stream.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/hda/hdac_stream.c b/sound/hda/hdac_stream.c index fc68d4ce0a37..d8fe7ff0cd58 100644 --- a/sound/hda/hdac_stream.c +++ b/sound/hda/hdac_stream.c @@ -229,11 +229,7 @@ int snd_hdac_stream_setup(struct hdac_stream *azx_dev) /* set the interrupt enable bits in the descriptor control register */ snd_hdac_stream_updatel(azx_dev, SD_CTL, 0, SD_INT_MASK); - if (azx_dev->direction == SNDRV_PCM_STREAM_PLAYBACK) - azx_dev->fifo_size = - snd_hdac_stream_readw(azx_dev, SD_FIFOSIZE) + 1; - else - azx_dev->fifo_size = 0; + azx_dev->fifo_size = snd_hdac_stream_readw(azx_dev, SD_FIFOSIZE) + 1; /* when LPIB delay correction gives a small negative value, * we ignore it; currently set the threshold statically to |