From ed0901dac48d6659331e9e34eec18f0ec62e712e Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Fri, 3 Dec 2010 17:25:57 +0800
Subject: [PATCH] --- yaml --- r: 230336 b: refs/heads/master c:
 4bd3a1f415affa4729856dca7e39c5093a9a954f h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/sound/soc/codecs/alc5623.c | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index afde091f4289..9911b6c898b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43fa95caab86fec0af7333bda407dd14f0c2127c
+refs/heads/master: 4bd3a1f415affa4729856dca7e39c5093a9a954f
diff --git a/trunk/sound/soc/codecs/alc5623.c b/trunk/sound/soc/codecs/alc5623.c
index 9783e7e2eb93..4f377c9e868d 100644
--- a/trunk/sound/soc/codecs/alc5623.c
+++ b/trunk/sound/soc/codecs/alc5623.c
@@ -925,7 +925,6 @@ static int alc5623_probe(struct snd_soc_codec *codec)
 	}
 
 	switch (alc5623->id) {
-	default:
 	case 0x21:
 		snd_soc_add_controls(codec, rt5621_vol_snd_controls,
 			ARRAY_SIZE(rt5621_vol_snd_controls));
@@ -938,6 +937,8 @@ static int alc5623_probe(struct snd_soc_codec *codec)
 		snd_soc_add_controls(codec, alc5623_vol_snd_controls,
 			ARRAY_SIZE(alc5623_vol_snd_controls));
 		break;
+	default:
+		return -EINVAL;
 	}
 
 	snd_soc_add_controls(codec, alc5623_snd_controls,
@@ -950,7 +951,6 @@ static int alc5623_probe(struct snd_soc_codec *codec)
 	snd_soc_dapm_add_routes(dapm, intercon, ARRAY_SIZE(intercon));
 
 	switch (alc5623->id) {
-	default:
 	case 0x21:
 	case 0x22:
 		snd_soc_dapm_new_controls(dapm, alc5623_dapm_amp_widgets,
@@ -962,6 +962,8 @@ static int alc5623_probe(struct snd_soc_codec *codec)
 		snd_soc_dapm_add_routes(dapm, intercon_spk,
 					ARRAY_SIZE(intercon_spk));
 		break;
+	default:
+		return -EINVAL;
 	}
 
 	return ret;
@@ -1039,10 +1041,12 @@ static int alc5623_i2c_probe(struct i2c_client *client,
 	case 0x22:
 		alc5623_dai.name = "alc5622-hifi";
 		break;
-	default:
 	case 0x23:
 		alc5623_dai.name = "alc5623-hifi";
 		break;
+	default:
+		kfree(alc5623);
+		return -EINVAL;
 	}
 
 	i2c_set_clientdata(client, alc5623);