Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7112a47 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: Add audio backend to hwdep interface" into msm-4.8

parents 4cd452a9 a19486ba

include/uapi/sound/asound.h

+2 −1
Original line number Diff line number Diff line
@@ -107,9 +107,10 @@ enum { 
	SNDRV_HWDEP_IFACE_FW_DIGI00X,	/* Digidesign Digi 002/003 family */

	SNDRV_HWDEP_IFACE_FW_TASCAM,	/* TASCAM FireWire series */

	SNDRV_HWDEP_IFACE_LINE6,	/* Line6 USB processors */

	SNDRV_HWDEP_IFACE_AUDIO_BE,	/* Backend Audio Control */



	/* Don't forget to change the following: */

	SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_LINE6

	SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_AUDIO_BE

};



struct snd_hwdep_info {

sound/soc/soc-pcm.c

+2 −0
Original line number Diff line number Diff line
@@ -2805,6 +2805,8 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) 
			pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream->private_data = rtd;

		if (capture)

			pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream->private_data = rtd;

		if (platform->driver->pcm_new)

			rtd->platform->driver->pcm_new(rtd);

		goto out;

	}