---

yaml --- r: 270763 b: refs/heads/master c: bfd3d4e h: refs/heads/master i: 270761: 6d7733b 270759: 395b5a0 v: v3
git-mirror · Oct 4, 2011 · 445eab3 · 445eab3
1 parent b64e6bb
commit 445eab3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cdffa775e72de3a3d3ddccd04eb4eb94d58e84e6
+refs/heads/master: bfd3d4e9fbb9705181b821b478cc044911e47320
diff --git a/trunk/sound/soc/codecs/twl6040.c b/trunk/sound/soc/codecs/twl6040.c
@@ -759,15 +759,13 @@ static int twl6040_put_volsw(struct snd_kcontrol *kcontrol,
 		out = &twl6040_priv->handsfree;
 		break;
 	default:
-		break;
+		return -EINVAL;
 	}
 
-	if (out) {
-		out->left_vol = ucontrol->value.integer.value[0];
-		out->right_vol = ucontrol->value.integer.value[1];
-		if (!out->active)
-			return 1;
-	}
+	out->left_vol = ucontrol->value.integer.value[0];
+	out->right_vol = ucontrol->value.integer.value[1];
+	if (!out->active)
+		return 1;
 
 	/* call the appropriate handler depending on the rreg */
 	if (mc->rreg)