Commit 8f093a21 authored Nov 22, 2019 by Colin Ian King Committed by Greg Kroah-Hartman Jan 09, 2020

ALSA: cs4236: fix error return comparison of an unsigned integer



commit d60229d84846a8399257006af9c5444599f64361 upstream.

The return from pnp_irq is an unsigned integer type resource_size_t
and hence the error check for a positive non-error code is always
going to be true.  A check for a non-failure return from pnp_irq
should in fact be for (resource_size_t)-1 rather than >= 0.

Addresses-Coverity: ("Unsigned compared against 0")
Fixes: a9824c86 ("[ALSA] Add CS4232 PnP BIOS support")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Link: https://lore.kernel.org/r/20191122131354.58042-1-colin.king@canonical.com


Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent f3248d6d

sound/isa/cs423x/cs4236.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -293,7 +293,8 @@ static int snd_cs423x_pnp_init_mpu(int dev, struct pnp_dev *pdev)
	} else {		} else {
	mpu_port[dev] = pnp_port_start(pdev, 0);		mpu_port[dev] = pnp_port_start(pdev, 0);
	if (mpu_irq[dev] >= 0 &&		if (mpu_irq[dev] >= 0 &&
	pnp_irq_valid(pdev, 0) && pnp_irq(pdev, 0) >= 0) {		pnp_irq_valid(pdev, 0) &&
			pnp_irq(pdev, 0) != (resource_size_t)-1) {
	mpu_irq[dev] = pnp_irq(pdev, 0);		mpu_irq[dev] = pnp_irq(pdev, 0);
	} else {		} else {
	mpu_irq[dev] = -1; /* disable interrupt */		mpu_irq[dev] = -1; /* disable interrupt */