Commit a2ae004a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "This batch ended up being larger than wished, but there is nothing to
  worry too much there.

  Most of commits are for ASoC, a compress NULL dereference fix, a fix
  for probe error handling, and the rest are device-specific fixes.  In
  addition, we have a fix for a long-standing but of seq-dummy driver,
  which just cuts off the buggy part in the end"

* tag 'sound-3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: seq-dummy: remove deadlock-causing events on close
  ASoC: omap-mcbsp: Correct CBM_CFS dai format configuration
  ASoC: soc-compress.c: fix NULL dereference
  ASoC: rt286: set the same format for dac and adc
  ASoC: wm8904: fix runtime warning
  ASoC: simple-card: Fix crash in asoc_simple_card_unref()
  ASoC: fsl: imx-wm8962: Set the card owner field
  ASoC: pcm512x: Fix DSP program selection
  ASoC: rt5677: Modify the behavior that updates the PLL parameter.
  ASoC: fsl_ssi: Fix irq error check
  ASoC: rockchip: i2s: applys rate symmetry for CPU DAI
  ASoC: Intel: Add NULL checks for the stream pointer
  ASoC: wm8960: Fix capture sample rate from 11250 to 11025
  ASoC: adi: Add missing return statement.
  ASoC: Intel: Don't change offset of block allocator during fixed allocate
  ASoC: ts3a227e: Check and report jack status at probe
  ASoC: fsl_esai: Fix incorrect xDC field width of xCCR registers
parents 297614f3 0767e95b

sound/core/seq/seq_dummy.c

+0 −31
Original line number Diff line number Diff line
@@ -81,36 +81,6 @@ struct snd_seq_dummy_port { 


static int my_client = -1;



/*

 * unuse callback - send ALL_SOUNDS_OFF and RESET_CONTROLLERS events

 * to subscribers.

 * Note: this callback is called only after all subscribers are removed.

 */

static int

dummy_unuse(void *private_data, struct snd_seq_port_subscribe *info)

{

	struct snd_seq_dummy_port *p;

	int i;

	struct snd_seq_event ev;



	p = private_data;

	memset(&ev, 0, sizeof(ev));

	if (p->duplex)

		ev.source.port = p->connect;

	else

		ev.source.port = p->port;

	ev.dest.client = SNDRV_SEQ_ADDRESS_SUBSCRIBERS;

	ev.type = SNDRV_SEQ_EVENT_CONTROLLER;

	for (i = 0; i < 16; i++) {

		ev.data.control.channel = i;

		ev.data.control.param = MIDI_CTL_ALL_SOUNDS_OFF;

		snd_seq_kernel_client_dispatch(p->client, &ev, 0, 0);

		ev.data.control.param = MIDI_CTL_RESET_CONTROLLERS;

		snd_seq_kernel_client_dispatch(p->client, &ev, 0, 0);

	}

	return 0;

}



/*

 * event input callback - just redirect events to subscribers

 */
@@ -175,7 +145,6 @@ create_port(int idx, int type) 
		| SNDRV_SEQ_PORT_TYPE_PORT;

	memset(&pcb, 0, sizeof(pcb));

	pcb.owner = THIS_MODULE;

	pcb.unuse = dummy_unuse;

	pcb.event_input = dummy_input;

	pcb.private_free = dummy_free;

	pcb.private_data = rec;

sound/soc/adi/axi-i2s.c

+2 −0
Original line number Diff line number Diff line
@@ -240,6 +240,8 @@ static int axi_i2s_probe(struct platform_device *pdev) 
	if (ret)

		goto err_clk_disable;



	return 0;



err_clk_disable:

	clk_disable_unprepare(i2s->clk);

	return ret;

sound/soc/codecs/pcm512x.c

+1 −1
Original line number Diff line number Diff line
@@ -188,8 +188,8 @@ static const DECLARE_TLV_DB_SCALE(boost_tlv, 0, 80, 0); 
static const char * const pcm512x_dsp_program_texts[] = {

	"FIR interpolation with de-emphasis",

	"Low latency IIR with de-emphasis",

	"Fixed process flow",

	"High attenuation with de-emphasis",

	"Fixed process flow",

	"Ringing-less low latency FIR",

};

sound/soc/codecs/rt286.c

+2 −4
Original line number Diff line number Diff line
@@ -861,9 +861,7 @@ static int rt286_hw_params(struct snd_pcm_substream *substream, 
		RT286_I2S_CTRL1, 0x0018, d_len_code << 3);

	dev_dbg(codec->dev, "format val = 0x%x\n", val);



	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)

	snd_soc_update_bits(codec, RT286_DAC_FORMAT, 0x407f, val);

	else

	snd_soc_update_bits(codec, RT286_ADC_FORMAT, 0x407f, val);



	return 0;

sound/soc/codecs/rt5677.c

+14 −4
Original line number Diff line number Diff line
@@ -2083,10 +2083,14 @@ static int rt5677_set_pll1_event(struct snd_soc_dapm_widget *w, 
	struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);



	switch (event) {

	case SND_SOC_DAPM_POST_PMU:

	case SND_SOC_DAPM_PRE_PMU:

		regmap_update_bits(rt5677->regmap, RT5677_PLL1_CTRL2, 0x2, 0x2);

		break;



	case SND_SOC_DAPM_POST_PMU:

		regmap_update_bits(rt5677->regmap, RT5677_PLL1_CTRL2, 0x2, 0x0);

		break;



	default:

		return 0;

	}
@@ -2101,10 +2105,14 @@ static int rt5677_set_pll2_event(struct snd_soc_dapm_widget *w, 
	struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);



	switch (event) {

	case SND_SOC_DAPM_POST_PMU:

	case SND_SOC_DAPM_PRE_PMU:

		regmap_update_bits(rt5677->regmap, RT5677_PLL2_CTRL2, 0x2, 0x2);

		break;



	case SND_SOC_DAPM_POST_PMU:

		regmap_update_bits(rt5677->regmap, RT5677_PLL2_CTRL2, 0x2, 0x0);

		break;



	default:

		return 0;

	}
@@ -2212,9 +2220,11 @@ static int rt5677_vref_event(struct snd_soc_dapm_widget *w, 


static const struct snd_soc_dapm_widget rt5677_dapm_widgets[] = {

	SND_SOC_DAPM_SUPPLY("PLL1", RT5677_PWR_ANLG2, RT5677_PWR_PLL1_BIT,

		0, rt5677_set_pll1_event, SND_SOC_DAPM_POST_PMU),

		0, rt5677_set_pll1_event, SND_SOC_DAPM_PRE_PMU |

		SND_SOC_DAPM_POST_PMU),

	SND_SOC_DAPM_SUPPLY("PLL2", RT5677_PWR_ANLG2, RT5677_PWR_PLL2_BIT,

		0, rt5677_set_pll2_event, SND_SOC_DAPM_POST_PMU),

		0, rt5677_set_pll2_event, SND_SOC_DAPM_PRE_PMU |

		SND_SOC_DAPM_POST_PMU),



	/* Input Side */

	/* micbias */

CRA Git | Maintained and supported by SUSTech CRA and CCSE