From 242b3d748e0eda349563a9b939554dde691ad892 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 17 Jul 2009 12:47:34 +0200
Subject: [PATCH] --- yaml --- r: 157795 b: refs/heads/master c:
 82e1b804b03defe46fb69ffd2c8b19e6649bcb0d h: refs/heads/master i:   157793:
 337d3aabe4dd3a7d2fb8be4bf401b4dfa0df1e03   157791:
 fd85f1f4965f30c8d87756d1e97cf0d99ad0ac6c v: v3

---
 [refs]                          | 2 +-
 trunk/sound/pci/hda/hda_codec.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9eb4db0487ee..5e33e631d373 100644
--- 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
index d9d326297834..35f0f223f85e 100644
--- 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;