From ed1812c44cdc04fc56c5e7f7fdcd31941ffce58d Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Fri, 18 May 2018 12:16:07 +0300 Subject: ALSA: dice: fix a bounds check in snd_dice_detect_tcelectronic_formats() The "entry" pointer is always non-NULL so this test for out of bounds won't work. Fixes: f1f0f330b1d0 ("ALSA: dice: add parameters of stream formats for models produced by TC Electronic") Signed-off-by: Dan Carpenter Reviewed-by: Takashi Sakamoto Signed-off-by: Takashi Iwai --- sound/firewire/dice/dice-tcelectronic.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'sound/firewire/dice') diff --git a/sound/firewire/dice/dice-tcelectronic.c b/sound/firewire/dice/dice-tcelectronic.c index af8203b9d1a6..e134a5110c6c 100644 --- a/sound/firewire/dice/dice-tcelectronic.c +++ b/sound/firewire/dice/dice-tcelectronic.c @@ -75,13 +75,12 @@ int snd_dice_detect_tcelectronic_formats(struct snd_dice *dice) } } - entry = NULL; for (i = 0; i < ARRAY_SIZE(entries); ++i) { entry = entries + i; if (entry->model_id == model_id) break; } - if (!entry) + if (i == ARRAY_SIZE(entries)) return -ENODEV; memcpy(dice->tx_pcm_chs, entry->spec->tx_pcm_chs, -- cgit v1.2.3-55-g7522