tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Mark Brown d7963b72 a36b3240

+6 -1
+5
sound/soc/fsl/imx-ssi.c
··· 496 496 497 497 if (imx_ssi->ac97_reset) 498 498 imx_ssi->ac97_reset(ac97); 499 + /* First read sometimes fails, do a dummy read */ 500 + imx_ssi_ac97_read(ac97, 0); 499 501 } 500 502 501 503 static void imx_ssi_ac97_warm_reset(struct snd_ac97 *ac97) ··· 506 504 507 505 if (imx_ssi->ac97_warm_reset) 508 506 imx_ssi->ac97_warm_reset(ac97); 507 + 508 + /* First read sometimes fails, do a dummy read */ 509 + imx_ssi_ac97_read(ac97, 0); 509 510 } 510 511 511 512 struct snd_ac97_bus_ops soc_ac97_ops = {
+1 -1
sound/soc/fsl/pcm030-audio-fabric.c
··· 51 51 .num_links = ARRAY_SIZE(pcm030_fabric_dai), 52 52 }; 53 53 54 - static int __init pcm030_fabric_probe(struct platform_device *op) 54 + static int pcm030_fabric_probe(struct platform_device *op) 55 55 { 56 56 struct device_node *np = op->dev.of_node; 57 57 struct device_node *platform_np;