X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Fs3c24xx%2Ffiles-2.6.30%2Fsound%2Fsoc%2Fs3c24xx%2Fgta02_wm8753.c;h=1f8f9db9b01d7af19b2b7b99b87b038968d6805f;hb=3eeb7b4c0ccb00e99e3f51ea178238b7c7354305;hp=4abb18a14b899abbc2c822f4f2cd6c4e8873d36b;hpb=fb189822fcab111e55d1c7e83c482dc2c144500a;p=openwrt-10.03%2F.git

diff --git a/target/linux/s3c24xx/files-2.6.30/sound/soc/s3c24xx/gta02_wm8753.c b/target/linux/s3c24xx/files-2.6.30/sound/soc/s3c24xx/gta02_wm8753.c
index 4abb18a14..1f8f9db9b 100644
--- a/target/linux/s3c24xx/files-2.6.30/sound/soc/s3c24xx/gta02_wm8753.c
+++ b/target/linux/s3c24xx/files-2.6.30/sound/soc/s3c24xx/gta02_wm8753.c
@@ -338,7 +338,7 @@ static const struct snd_kcontrol_new wm8753_neo1973_gta02_controls[] = {
  */
 static int neo1973_gta02_wm8753_init(struct snd_soc_codec *codec)
 {
-	int i, err;
+	int err;
 
 	/* set up NC codec pins */
 	snd_soc_dapm_nc_pin(codec, "OUT3");
@@ -351,13 +351,11 @@ static int neo1973_gta02_wm8753_init(struct snd_soc_codec *codec)
 				  ARRAY_SIZE(wm8753_dapm_widgets));
 
 	/* add neo1973 gta02 specific controls */
-	for (i = 0; i < ARRAY_SIZE(wm8753_neo1973_gta02_controls); i++) {
-		err = snd_ctl_add(codec->card,
-			snd_soc_cnew(&wm8753_neo1973_gta02_controls[i],
-			codec, NULL));
-		if (err < 0)
-			return err;
-	}
+	err = snd_soc_add_controls(codec, wm8753_neo1973_gta02_controls,
+		ARRAY_SIZE(wm8753_neo1973_gta02_controls));
+
+	if (err < 0)
+		return err;
 
 	/* set up neo1973 gta02 specific audio path audio_map */
 	snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));