lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Brown
2013-03-26 14:08:01 +00:00
parent a36b32402a 34913fd950
commit d7963b72e4
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sound/soc/fsl/imx-ssi.c
View File

@@ -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 = {

2
sound/soc/fsl/pcm030-audio-fabric.c
View File

@@ -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;