ASoC: SOF: fix HDA direct MMIO access
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Mon, 12 Aug 2019 19:05:02 +0000 (14:05 -0500)
committerMark Brown <broonie@kernel.org>
Tue, 13 Aug 2019 11:41:04 +0000 (12:41 +0100)
commit9c6c417d95d83999c16965186f6e755ad8a8b658
tree70722a48f6dcf80c27a78c6de462f5ea12463514
parent8da2d74c10fd71cc04e2585fe8bb3ced325f8e25
ASoC: SOF: fix HDA direct MMIO access

The recent change to remove the bus->io_ops callbacks used an older
version of the SOF code base, and when merged into Mark's for-next it
invalidated changes, resulting in broken compilation identified by
kbuild and reproduced during the weekly SOF rebase.

Restore SOF code overridden by git merge and apply Takashi's intended
change in the 'right' location.

Fixes: c2f16a94a8049 ("Merge branch 'topic/hda-bus-ops-cleanup'")
Reported-by: kbuild test robot <lkp@intel.com>
Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20190812190502.30729-1-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sof/intel/hda-ctrl.c
sound/soc/sof/intel/hda-dsp.c