Commit 8a6dcddf authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/adi', 'asoc/fix/compress',... 

Merge remote-tracking branches 'asoc/fix/adi', 'asoc/fix/compress', 'asoc/fix/fsl-ssi', 'asoc/fix/imx', 'asoc/fix/intel', 'asoc/fix/omap', 'asoc/fix/rockchip' and 'asoc/fix/rt286' into asoc-linus
parents a9bb437a ae6f636b d3268a40 64aa5f58 0984f341 f81677b4 20602e34 a12d159d 45437fa5

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/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/fsl/fsl_ssi.c

+2 −2
Original line number Diff line number Diff line
@@ -1362,9 +1362,9 @@ static int fsl_ssi_probe(struct platform_device *pdev) 
	}



	ssi_private->irq = platform_get_irq(pdev, 0);

	if (!ssi_private->irq) {

	if (ssi_private->irq < 0) {

		dev_err(&pdev->dev, "no irq for node %s\n", np->full_name);

		return -ENXIO;

		return ssi_private->irq;

	}



	/* Are the RX and the TX clocks locked? */

sound/soc/fsl/imx-wm8962.c

+1 −0
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ static int imx_wm8962_probe(struct platform_device *pdev) 
	if (ret)

		goto clk_fail;

	data->card.num_links = 1;

	data->card.owner = THIS_MODULE;

	data->card.dai_link = &data->dai;

	data->card.dapm_widgets = imx_wm8962_dapm_widgets;

	data->card.num_dapm_widgets = ARRAY_SIZE(imx_wm8962_dapm_widgets);

sound/soc/intel/sst-firmware.c

+7 −6
Original line number Diff line number Diff line
@@ -706,6 +706,7 @@ static int block_alloc_fixed(struct sst_dsp *dsp, struct sst_block_allocator *ba 
	struct list_head *block_list)

{

	struct sst_mem_block *block, *tmp;

	struct sst_block_allocator ba_tmp = *ba;

	u32 end = ba->offset + ba->size, block_end;

	int err;
@@ -730,9 +731,9 @@ static int block_alloc_fixed(struct sst_dsp *dsp, struct sst_block_allocator *ba 
		if (ba->offset >= block->offset && ba->offset < block_end) {



			/* align ba to block boundary */

			ba->size -= block_end - ba->offset;

			ba->offset = block_end;

			err = block_alloc_contiguous(dsp, ba, block_list);

			ba_tmp.size -= block_end - ba->offset;

			ba_tmp.offset = block_end;

			err = block_alloc_contiguous(dsp, &ba_tmp, block_list);

			if (err < 0)

				return -ENOMEM;
@@ -767,10 +768,10 @@ static int block_alloc_fixed(struct sst_dsp *dsp, struct sst_block_allocator *ba 
			list_move(&block->list, &dsp->used_block_list);

			list_add(&block->module_list, block_list);

			/* align ba to block boundary */

			ba->size -= block_end - ba->offset;

			ba->offset = block_end;

			ba_tmp.size -= block_end - ba->offset;

			ba_tmp.offset = block_end;



			err = block_alloc_contiguous(dsp, ba, block_list);

			err = block_alloc_contiguous(dsp, &ba_tmp, block_list);

			if (err < 0)

				return -ENOMEM;