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

Commit 8b169cb2 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Takashi Iwai
Browse files

ALSA: mips: avoid potential uninitialized variable use 



MIPS allmodconfig results in this warning:

sound/mips/hal2.c: In function 'hal2_gain_get':
sound/mips/hal2.c:224:35: error: 'r' may be used uninitialized in this function [-Werror=maybe-uninitialized]
sound/mips/hal2.c:223:35: error: 'l' may be used uninitialized in this function [-Werror=maybe-uninitialized]
sound/mips/hal2.c: In function 'hal2_gain_put':
sound/mips/hal2.c:260:13: error: 'new' may be used uninitialized in this function [-Werror=maybe-uninitialized]
sound/mips/hal2.c:260:13: error: 'old' may be used uninitialized in this function [-Werror=maybe-uninitialized]

Returning an error for all unexpected cases shuts up the warning

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent a535ad57

sound/mips/hal2.c

+4 −0
Original line number Diff line number Diff line
@@ -219,6 +219,8 @@ static int hal2_gain_get(struct snd_kcontrol *kcontrol, 
		l = (tmp >> H2I_C2_L_GAIN_SHIFT) & 15;

		r = (tmp >> H2I_C2_R_GAIN_SHIFT) & 15;

		break;

	default:

		return -EINVAL;

	}

	ucontrol->value.integer.value[0] = l;

	ucontrol->value.integer.value[1] = r;
@@ -256,6 +258,8 @@ static int hal2_gain_put(struct snd_kcontrol *kcontrol, 
		new |= (r << H2I_C2_R_GAIN_SHIFT);

		hal2_i_write32(hal2, H2I_ADC_C2, new);

		break;

	default:

		return -EINVAL;

	}

	return old != new;

}