From: Rongrong Cao rrcao@ambarella.com

This patch is based on linux-2.6.30.1 In SOC DAPM layer of SOUND subsystem, when add signal route (in the function snd_soc_dapm_add_route() ), the original code has wrong logic when dapm layer check each widget whether an external one.

---------------------------------------------------------------------------------------------------------

--- linux-2.6.30.1/sound/soc/soc-dapm.c.orig 2009-07-06 19:48:43.000000000 +0800 +++ linux-2.6.30.1/sound/soc/soc-dapm.c 2009-07-06 19:03:15.000000000 +0800 @@ -983,8 +983,8 @@ static int snd_soc_dapm_add_route(struct if (wsink->id == snd_soc_dapm_input) { if (wsource->id == snd_soc_dapm_micbias || wsource->id == snd_soc_dapm_mic || - wsink->id == snd_soc_dapm_line || - wsink->id == snd_soc_dapm_output) + wsource->id == snd_soc_dapm_line || + wsource->id == snd_soc_dapm_output) wsink->ext = 1; } if (wsource->id == snd_soc_dapm_output) {

---------------------------------------------------------------------------------------------------------

Signed-off-by: Rongrong Cao rrcao@ambarella.com

******************** Best regards! Allen (Rongrong) Cao Ambarella Shanghai Ltd. Tel: (86-21) 50942311 Fax: (86-21) 50942321

---------------------------------------------------------------------------------------------------------------------------------- This email message (including attachments) contains Ambarella Proprietary and/or Confidential Information and is intended only for the addressee. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email immediately and destroy all copies of the original message. ----------------------------------------------------------------------------------------------------------------------------------