diff --git a/[refs] b/[refs]
index 17b2f13e48e4..aac313e181b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30ba6e207a915a6c70f22ccb3f9169d1cce88466
+refs/heads/master: cf93907b98c82c2157e5bbe766bee8f1c5bb87b2
diff --git a/trunk/sound/i2c/other/ak4xxx-adda.c b/trunk/sound/i2c/other/ak4xxx-adda.c
index d76d8b078a81..0aea536a3371 100644
--- a/trunk/sound/i2c/other/ak4xxx-adda.c
+++ b/trunk/sound/i2c/other/ak4xxx-adda.c
@@ -137,6 +137,8 @@ void snd_akm4xxx_reset(struct snd_akm4xxx *ak, int state)
 	case SND_AK4381:
 		ak4381_reset(ak, state);
 		break;
+	default:
+		break;
 	}
 }
 
@@ -727,6 +729,9 @@ int snd_akm4xxx_build_controls(struct snd_akm4xxx *ak)
 		case SND_AK4381:
 			ctl->private_value = AK_COMPOSE(idx, 1, 1, 0);
 			break;
+		default:
+			err = -EINVAL;
+			goto __error;
 		}
 		ctl->private_data = ak;
 		err = snd_ctl_add(ak->card,