diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-01-20 11:44:35 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-01-20 11:44:51 +0100 |
| commit | 9d0af44c2ed036c663832f3b764ffd1109c8b79e (patch) | |
| tree | 629864b4ce2743873f672d2ca03c0e295fb98525 /sound/pci/hda/hda_tegra.c | |
| parent | ALSA: hda/realtek - Add Headset Mic supported for HP cPC (diff) | |
| parent | ALSA: hda: Apply aligned MMIO access only conditionally (diff) | |
| download | linux-9d0af44c2ed036c663832f3b764ffd1109c8b79e.tar.xz linux-9d0af44c2ed036c663832f3b764ffd1109c8b79e.zip | |
Merge branch 'for-linus' into for-next
Resolved the merge conflict in HD-audio Tegra driver.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_tegra.c')
| -rw-r--r-- | sound/pci/hda/hda_tegra.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_tegra.c b/sound/pci/hda/hda_tegra.c index 567c9ebddb2e..773992a07efa 100644 --- a/sound/pci/hda/hda_tegra.c +++ b/sound/pci/hda/hda_tegra.c @@ -395,6 +395,7 @@ static int hda_tegra_create(struct snd_card *card, return err; chip->bus.core.needs_damn_long_delay = 1; + chip->bus.core.aligned_mmio = 1; err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops); if (err < 0) { |