diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-26 14:08:01 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-26 14:08:01 +0000 |
| commit | d7963b72e4f7c41f741dbf75003f9ca23eac6512 (patch) | |
| tree | fe9df05b990943c87119d0c3ed8f512c27993129 /sound/soc | |
| parent | a36b32402a805033beed752ea85c5ed62586fe35 (diff) | |
| parent | 34913fd950dc1817d466d76bdccd63443fdcbb12 (diff) | |
| download | talos-obmc-linux-d7963b72e4f7c41f741dbf75003f9ca23eac6512.tar.gz talos-obmc-linux-d7963b72e4f7c41f741dbf75003f9ca23eac6512.zip | |
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-next
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/fsl/imx-ssi.c | 5 | ||||
| -rw-r--r-- | sound/soc/fsl/pcm030-audio-fabric.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c index 55464a5b0706..810c7eeb7b03 100644 --- a/sound/soc/fsl/imx-ssi.c +++ b/sound/soc/fsl/imx-ssi.c @@ -496,6 +496,8 @@ static void imx_ssi_ac97_reset(struct snd_ac97 *ac97) if (imx_ssi->ac97_reset) 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) @@ -504,6 +506,9 @@ static void imx_ssi_ac97_warm_reset(struct snd_ac97 *ac97) if (imx_ssi->ac97_warm_reset) 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 = { 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 = { .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 *platform_np; |
