Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82e1b804 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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: default avatarTakashi Iwai <tiwai@suse.de>
parent 6430aeeb

sound/pci/hda/hda_codec.c

+2 −2
Original line number Diff line number Diff line
@@ -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;