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

Commit 60529c65 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/core' of... 

Merge branch 'topic/core' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-dapm
parents 5d99d778 5f6e7d52

sound/soc/codecs/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ config SND_SOC_I2C_AND_SPI 


config SND_SOC_ALL_CODECS

	tristate "Build all ASoC CODEC drivers"

	depends on COMPILE_TEST

	select SND_SOC_88PM860X if MFD_88PM860X

	select SND_SOC_L3

	select SND_SOC_AB8500_CODEC if ABX500_CORE

sound/soc/soc-dapm.c

+0 −30
Original line number Diff line number Diff line
@@ -174,36 +174,6 @@ static inline struct snd_soc_dapm_widget *dapm_cnew_widget( 
	return kmemdup(_widget, sizeof(*_widget), GFP_KERNEL);

}



/* get snd_card from DAPM context */

static inline struct snd_card *dapm_get_snd_card(

	struct snd_soc_dapm_context *dapm)

{

	if (dapm->codec)

		return dapm->codec->card->snd_card;

	else if (dapm->platform)

		return dapm->platform->card->snd_card;

	else

		BUG();



	/* unreachable */

	return NULL;

}



/* get soc_card from DAPM context */

static inline struct snd_soc_card *dapm_get_soc_card(

		struct snd_soc_dapm_context *dapm)

{

	if (dapm->codec)

		return dapm->codec->card;

	else if (dapm->platform)

		return dapm->platform->card;

	else

		BUG();



	/* unreachable */

	return NULL;

}



static void dapm_reset(struct snd_soc_card *card)

{

	struct snd_soc_dapm_widget *w;

sound/soc/soc-jack.c

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ static irqreturn_t gpio_handler(int irq, void *data) 
	if (device_may_wakeup(dev))

		pm_wakeup_event(dev, gpio->debounce_time + 50);



	schedule_delayed_work(&gpio->work,

	queue_delayed_work(system_power_efficient_wq, &gpio->work,

			      msecs_to_jiffies(gpio->debounce_time));



	return IRQ_HANDLED;

sound/soc/soc-pcm.c

+3 −2
Original line number Diff line number Diff line
@@ -411,7 +411,8 @@ static int soc_pcm_close(struct snd_pcm_substream *substream) 
		} else {

			/* start delayed pop wq here for playback streams */

			rtd->pop_wait = 1;

			schedule_delayed_work(&rtd->delayed_work,

			queue_delayed_work(system_power_efficient_wq,

					   &rtd->delayed_work,

					   msecs_to_jiffies(rtd->pmdown_time));

		}

	} else {