---

yaml --- r: 157795 b: refs/heads/master c: 82e1b80 h: refs/heads/master i: 157793: 337d3aa 157791: fd85f1f v: v3
git-mirror · Jul 17, 2009 · 242b3d7 · 242b3d7
1 parent 4bd4127
commit 242b3d7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6430aeeb30b478d4ef25f988b1fde6f6ae83adb5
+refs/heads/master: 82e1b804b03defe46fb69ffd2c8b19e6649bcb0d
diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c
@@ -150,8 +150,8 @@ make_codec_cmd(struct hda_codec *codec, hda_nid_t nid, int direct,
 {
 	u32 val;
 
-	if ((codec->addr & ~0xf) | (direct & ~1) | (nid & ~0x7f) |
-	    (verb & ~0xfff) | (parm & ~0xff)) {
+	if ((codec->addr & ~0xf) || (direct & ~1) || (nid & ~0x7f) ||
+	    (verb & ~0xfff) || (parm & ~0xffff)) {
 		printk(KERN_ERR "hda-codec: out of range cmd %x:%x:%x:%x:%x\n",
 		       codec->addr, direct, nid, verb, parm);
 		return ~0;