diff --git a/[refs] b/[refs]
index b4d8bccc54e8..06f0bb105d7e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f4d4a80fbcb1e09cfb95660bcd2b677ea6d04c1
+refs/heads/master: fe9bab2df96cec7011773aab272515b9faa9b6c4
diff --git a/trunk/sound/oss/sb_mixer.c b/trunk/sound/oss/sb_mixer.c
index f56898c3981e..ccb21d48d42c 100644
--- a/trunk/sound/oss/sb_mixer.c
+++ b/trunk/sound/oss/sb_mixer.c
@@ -273,14 +273,14 @@ int sb_common_mixer_set(sb_devc * devc, int dev, int left, int right)
 	int regoffs;
 	unsigned char val;
 
+	if ((dev < 0) || (dev >= devc->iomap_sz))
+		return -EINVAL;
+
 	regoffs = (*devc->iomap)[dev][LEFT_CHN].regno;
 
 	if (regoffs == 0)
 		return -EINVAL;
 
-	if ((dev < 0) || (dev >= devc->iomap_sz))
-	    return -EINVAL;
-
 	val = sb_getmixer(devc, regoffs);
 	change_bits(devc, &val, dev, LEFT_CHN, left);