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

Merge remote-tracking branch 'asoc/fix/fsl' into asoc-next

parents a36b3240 34913fd9

sound/soc/fsl/imx-ssi.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -496,6 +496,8 @@ static void imx_ssi_ac97_reset(struct snd_ac97 *ac97) 




	if (imx_ssi->ac97_reset)

	if (imx_ssi->ac97_reset)

		imx_ssi->ac97_reset(ac97);

		imx_ssi->ac97_reset(ac97);

	/* First read sometimes fails, do a dummy read */

	imx_ssi_ac97_read(ac97, 0);

}

}





static void imx_ssi_ac97_warm_reset(struct snd_ac97 *ac97)

static void imx_ssi_ac97_warm_reset(struct snd_ac97 *ac97)
@@ -504,6 +506,9 @@ static void imx_ssi_ac97_warm_reset(struct snd_ac97 *ac97) 




	if (imx_ssi->ac97_warm_reset)

	if (imx_ssi->ac97_warm_reset)

		imx_ssi->ac97_warm_reset(ac97);

		imx_ssi->ac97_warm_reset(ac97);



	/* First read sometimes fails, do a dummy read */

	imx_ssi_ac97_read(ac97, 0);

}

}





struct snd_ac97_bus_ops soc_ac97_ops = {

struct snd_ac97_bus_ops soc_ac97_ops = {

sound/soc/fsl/pcm030-audio-fabric.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -51,7 +51,7 @@ static struct snd_soc_card pcm030_card = { 
	.num_links = ARRAY_SIZE(pcm030_fabric_dai),

	.num_links = ARRAY_SIZE(pcm030_fabric_dai),

};

};





static int __init pcm030_fabric_probe(struct platform_device *op)

static int pcm030_fabric_probe(struct platform_device *op)

{

{

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

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

	struct device_node *platform_np;

	struct device_node *platform_np;