diff options
| author | Takashi Iwai | 2009-07-17 12:47:34 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2009-07-17 12:47:34 +0200 |
| commit | 82e1b804b03defe46fb69ffd2c8b19e6649bcb0d (patch) | |
| tree | b4f896bcb0e1197a021809355af70a6c1da913fe /sound | |
| parent | ALSA: hda - add bounds checking for the codec command fields (diff) | |
| download | kernel-qcow2-linux-82e1b804b03defe46fb69ffd2c8b19e6649bcb0d.tar.gz kernel-qcow2-linux-82e1b804b03defe46fb69ffd2c8b19e6649bcb0d.tar.xz kernel-qcow2-linux-82e1b804b03defe46fb69ffd2c8b19e6649bcb0d.zip | |
ALSA: hda - Fix the previous sanity check in make_codec_cmd()
The newly added sanity-check for a codec verb can be better written
with logical ORs. Also, the parameter can be more than 8bit.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index d9d326297834..35f0f223f85e 100644 --- a/sound/pci/hda/hda_codec.c +++ b/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; |