summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2019-07-29 09:14:22 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-29 10:21:46 +0100
commit09deaf6acad81fffcbf11c4c7f86cdf83854aff1 (patch)
treea22acee276df233f87654bb21743799ad1f6c32b /sound
parent7638131006ea80bb4fffa7d01c8038490062d7d0 (diff)
ALSA: aoa: onyx: always initialize register read value
[ Upstream commit f474808acb3c4b30552d9c59b181244e0300d218 ] A lot of places in the driver use onyx_read_register() without checking the return value, and it's been working OK for ~10 years or so, so probably never fails ... Rather than trying to check the return value everywhere, which would be relatively intrusive, at least make sure we don't use an uninitialized value. Fixes: f3d9478b2ce4 ("[ALSA] snd-aoa: add snd-aoa") Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/aoa/codecs/onyx.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c
index a04edff8b729..ae50d59fb810 100644
--- a/sound/aoa/codecs/onyx.c
+++ b/sound/aoa/codecs/onyx.c
@@ -74,8 +74,10 @@ static int onyx_read_register(struct onyx *onyx, u8 reg, u8 *value)
return 0;
}
v = i2c_smbus_read_byte_data(onyx->i2c, reg);
- if (v < 0)
+ if (v < 0) {
+ *value = 0;
return -1;
+ }
*value = (u8)v;
onyx->cache[ONYX_REG_CONTROL-FIRSTREGISTER] = *value;
return 0;