aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/fsl
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/fsl')
-rw-r--r--sound/soc/fsl/imx-ssi.c5
-rw-r--r--sound/soc/fsl/pcm030-audio-fabric.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c
index 90110ada270d..4a26d88d7236 100644
--- a/sound/soc/fsl/imx-ssi.c
+++ b/sound/soc/fsl/imx-ssi.c
@@ -500,6 +500,8 @@ static void imx_ssi_ac97_reset(struct snd_ac97 *ac97)
500 500
501 if (imx_ssi->ac97_reset) 501 if (imx_ssi->ac97_reset)
502 imx_ssi->ac97_reset(ac97); 502 imx_ssi->ac97_reset(ac97);
503 /* First read sometimes fails, do a dummy read */
504 imx_ssi_ac97_read(ac97, 0);
503} 505}
504 506
505static void imx_ssi_ac97_warm_reset(struct snd_ac97 *ac97) 507static void imx_ssi_ac97_warm_reset(struct snd_ac97 *ac97)
@@ -508,6 +510,9 @@ static void imx_ssi_ac97_warm_reset(struct snd_ac97 *ac97)
508 510
509 if (imx_ssi->ac97_warm_reset) 511 if (imx_ssi->ac97_warm_reset)
510 imx_ssi->ac97_warm_reset(ac97); 512 imx_ssi->ac97_warm_reset(ac97);
513
514 /* First read sometimes fails, do a dummy read */
515 imx_ssi_ac97_read(ac97, 0);
511} 516}
512 517
513struct snd_ac97_bus_ops soc_ac97_ops = { 518struct snd_ac97_bus_ops soc_ac97_ops = {
diff --git a/sound/soc/fsl/pcm030-audio-fabric.c b/sound/soc/fsl/pcm030-audio-fabric.c
index 8e52c1485df3..eb4373840bb6 100644
--- a/sound/soc/fsl/pcm030-audio-fabric.c
+++ b/sound/soc/fsl/pcm030-audio-fabric.c
@@ -51,7 +51,7 @@ static struct snd_soc_card pcm030_card = {
51 .num_links = ARRAY_SIZE(pcm030_fabric_dai), 51 .num_links = ARRAY_SIZE(pcm030_fabric_dai),
52}; 52};
53 53
54static int __init pcm030_fabric_probe(struct platform_device *op) 54static int pcm030_fabric_probe(struct platform_device *op)
55{ 55{
56 struct device_node *np = op->dev.of_node; 56 struct device_node *np = op->dev.of_node;
57 struct device_node *platform_np; 57 struct device_node *platform_np;