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

Commit 0a78b248 authored by Douglas Anderson's avatar Douglas Anderson Committed by Mark Brown
Browse files

ASoC: rt5514: Avoid relying on uninitialized "val" value 



In rt5514_i2c_probe() if the regmap_read(RT5514_VENDOR_ID2) fails then
"val" may be left as uninitialized.  Current code relies on "val" not
being RT5514_DEVICE_ID, but that's potentially unsafe.

Let's check for errors from regmap_read() and also explicitly init the
value do we're not passing a possibly uninitialized int to printk.

Signed-off-by: default avatarDouglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d0c02e14

sound/soc/codecs/rt5514.c

+3 −3
Original line number Diff line number Diff line
@@ -1090,7 +1090,7 @@ static int rt5514_i2c_probe(struct i2c_client *i2c, 
	struct rt5514_platform_data *pdata = dev_get_platdata(&i2c->dev);

	struct rt5514_priv *rt5514;

	int ret;

	unsigned int val;

	unsigned int val = ~0;



	rt5514 = devm_kzalloc(&i2c->dev, sizeof(struct rt5514_priv),

				GFP_KERNEL);
@@ -1120,8 +1120,8 @@ static int rt5514_i2c_probe(struct i2c_client *i2c, 
		return ret;

	}



	regmap_read(rt5514->regmap, RT5514_VENDOR_ID2, &val);

	if (val != RT5514_DEVICE_ID) {

	ret = regmap_read(rt5514->regmap, RT5514_VENDOR_ID2, &val);

	if (ret || val != RT5514_DEVICE_ID) {

		dev_err(&i2c->dev,

			"Device with ID register %x is not rt5514\n", val);

		return -ENODEV;