diff --git a/[refs] b/[refs]
index 06633c3b16c9..332308ddb729 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0f5039c3dcc6f80756128aa38f2a4f5b895bbf1
+refs/heads/master: ca1004bab9c6829e64036f7da5e25a698756ee28
diff --git a/trunk/sound/soc/codecs/adav80x.c b/trunk/sound/soc/codecs/adav80x.c
index e30fba62392d..300c04b70e71 100644
--- a/trunk/sound/soc/codecs/adav80x.c
+++ b/trunk/sound/soc/codecs/adav80x.c
@@ -456,7 +456,7 @@ static int adav80x_set_capture_pcm_format(struct snd_soc_codec *codec,
 		val = ADAV80X_CAPTURE_WORD_LEN24;
 		break;
 	default:
-		break;
+		return -EINVAL;
 	}
 
 	snd_soc_update_bits(codec, adav80x_port_ctrl_regs[dai->id][0],
@@ -488,7 +488,7 @@ static int adav80x_set_playback_pcm_format(struct snd_soc_codec *codec,
 		val = ADAV80X_PLAYBACK_MODE_RIGHT_J_24;
 		break;
 	default:
-		break;
+		return -EINVAL;
 	}
 
 	snd_soc_update_bits(codec, adav80x_port_ctrl_regs[dai->id][1],