[alsa-devel] [PATCH] SoC: Samsung: Fix outdated cpu_dai_name for s3c24xx i2s

[Mark Brown]

On Sat, Jan 22, 2011 at 11:38:08PM +0100, Lars-Peter Clausen wrote:
> During the multi-component patch the s3c24xx i2s driver was renamed from
> "s3c24xx-i2s" to "s3c24xx-iis", while the sound board drivers were not
> updated to reflect this change as well.
> 
> As a result there is no match between the dai_link and the i2s driver and no
> sound card is instantiated.
> 
> This patch fixes the problem by updating the sound board drivers to use
> "s3c24xx-iis" for the cpu_dai_name.

This patch doesn't apply, git am says:

Applying: SoC: Samsung: Fix outdated cpu_dai_name for s3c24xx i2s
error: patch failed: sound/soc/samsung/neo1973_wm8753.c:559
error: sound/soc/samsung/neo1973_wm8753.c: patch does not apply
error: patch failed: sound/soc/samsung/s3c24xx_simtec_hermes.c:85
error: sound/soc/samsung/s3c24xx_simtec_hermes.c: patch does not apply
error: patch failed: sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c:74
error: sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c: patch does not apply
Patch failed at 0001 SoC: Samsung: Fix outdated cpu_dai_name for s3c24xx i2s

Please submit fixes against the current fix branch, currently 2.6.38.