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

Merge remote-tracking branches 'asoc/fix/88pm860x', 'asoc/fix/fsl',... 

Merge remote-tracking branches 'asoc/fix/88pm860x', 'asoc/fix/fsl', 'asoc/fix/imx', 'asoc/fix/mc13783', 'asoc/fix/rockchip' and 'asoc/fix/simple' into asoc-linus
parents 699f8584 77eca3cd 960baba4 5c4c99f3 a66ae631 528a82b4 2dbab978

sound/soc/codecs/88pm860x-codec.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ struct pm860x_priv { 
	struct pm860x_det	det;



	int			irq[4];

	unsigned char		name[4][MAX_NAME_LEN];

	unsigned char		name[4][MAX_NAME_LEN+1];

};



/* -9450dB to 0dB in 150dB steps ( mute instead of -9450dB) */

sound/soc/codecs/mc13783.c

+10 −6
Original line number Diff line number Diff line
@@ -765,12 +765,18 @@ static int __init mc13783_codec_probe(struct platform_device *pdev) 
			return -ENOSYS;



		ret = of_property_read_u32(np, "adc-port", &priv->adc_ssi_port);

		if (ret)

			goto out;

		if (ret) {

			of_node_put(np);

			return ret;

		}



		ret = of_property_read_u32(np, "dac-port", &priv->dac_ssi_port);

		if (ret)

			goto out;

		if (ret) {

			of_node_put(np);

			return ret;

		}



		of_node_put(np);

	}



	dev_set_drvdata(&pdev->dev, priv);
@@ -783,8 +789,6 @@ static int __init mc13783_codec_probe(struct platform_device *pdev) 
		ret = snd_soc_register_codec(&pdev->dev, &soc_codec_dev_mc13783,

			mc13783_dai_async, ARRAY_SIZE(mc13783_dai_async));



out:

	of_node_put(np);

	return ret;

}

sound/soc/fsl/imx-es8328.c

+2 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static const struct snd_soc_dapm_widget imx_es8328_dapm_widgets[] = { 
static int imx_es8328_probe(struct platform_device *pdev)

{

	struct device_node *np = pdev->dev.of_node;

	struct device_node *ssi_np, *codec_np;

	struct device_node *ssi_np = NULL, *codec_np = NULL;

	struct platform_device *ssi_pdev;

	struct imx_es8328_data *data;

	u32 int_port, ext_port;
@@ -104,6 +104,7 @@ static int imx_es8328_probe(struct platform_device *pdev) 
	if (ext_port > MUX_PORT_MAX || ext_port == 0) {

		dev_err(dev, "mux-ext-port: hardware only has %d mux ports\n",

			MUX_PORT_MAX);

		ret = -EINVAL;

		goto fail;

	}

sound/soc/generic/simple-card.c

+3 −0
Original line number Diff line number Diff line
@@ -501,6 +501,9 @@ static int asoc_simple_card_probe(struct platform_device *pdev) 
	priv->snd_card.dai_link = dai_link;

	priv->snd_card.num_links = num_links;



	priv->gpio_hp_det = -ENOENT;

	priv->gpio_mic_det = -ENOENT;



	/* Get room for the other properties */

	priv->dai_props = devm_kzalloc(dev,

			sizeof(*priv->dai_props) * num_links,

sound/soc/rockchip/rockchip_i2s.c

+3 −1
Original line number Diff line number Diff line
@@ -108,8 +108,10 @@ static void rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on) 
			while (val) {

				regmap_read(i2s->regmap, I2S_CLR, &val);

				retry--;

				if (!retry)

				if (!retry) {

					dev_warn(i2s->dev, "fail to clear\n");

					break;

				}

			}

		}

	}