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

Commit e65f6b1e authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/core' into asoc-linus

parents 69e273c0 4d61b39b

include/sound/soc.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -277,7 +277,7 @@ 
	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE | \

	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE | \

		  SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK, \

		  SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK, \

	.tlv.c = (snd_soc_bytes_tlv_callback), \

	.tlv.c = (snd_soc_bytes_tlv_callback), \

	.info = snd_soc_info_bytes_ext, \

	.info = snd_soc_bytes_info_ext, \

	.private_value = (unsigned long)&(struct soc_bytes_ext) \

	.private_value = (unsigned long)&(struct soc_bytes_ext) \

		{.max = xcount, .get = xhandler_get, .put = xhandler_put, } }

		{.max = xcount, .get = xhandler_get, .put = xhandler_put, } }

#define SOC_SINGLE_XR_SX(xname, xregbase, xregcount, xnbits, \

#define SOC_SINGLE_XR_SX(xname, xregbase, xregcount, xnbits, \

sound/soc/soc-core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1325,7 +1325,7 @@ static int soc_post_component_init(struct snd_soc_pcm_runtime *rtd, 
	device_initialize(rtd->dev);

	device_initialize(rtd->dev);

	rtd->dev->parent = rtd->card->dev;

	rtd->dev->parent = rtd->card->dev;

	rtd->dev->release = rtd_release;

	rtd->dev->release = rtd_release;

	rtd->dev->init_name = name;

	dev_set_name(rtd->dev, "%s", name);

	dev_set_drvdata(rtd->dev, rtd);

	dev_set_drvdata(rtd->dev, rtd);

	mutex_init(&rtd->pcm_mutex);

	mutex_init(&rtd->pcm_mutex);

	INIT_LIST_HEAD(&rtd->dpcm[SNDRV_PCM_STREAM_PLAYBACK].be_clients);

	INIT_LIST_HEAD(&rtd->dpcm[SNDRV_PCM_STREAM_PLAYBACK].be_clients);