Commit 2042f3c2 authored Jul 05, 2017 by Christophe JAILLET Committed by Lee Jones Sep 05, 2017

mfd: max8998: Fix potential NULL pointer dereference



if 'max8998_i2c_parse_dt_pdata() fails (when out of memory), a NULL
pointer dereference will occur in the error handling code.

Return directly instead.

Fixes: ee999fb3("mfd: max8998: Add support for Device Tree")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

parent 09530751

drivers/mfd/max8998.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -192,10 +192,8 @@ static int max8998_i2c_probe(struct i2c_client *i2c,

		if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node) {
		pdata = max8998_i2c_parse_dt_pdata(&i2c->dev);
		if (IS_ERR(pdata)) {
		ret = PTR_ERR(pdata);
		goto err;
		}
		if (IS_ERR(pdata))
		return PTR_ERR(pdata);
		}

		i2c_set_clientdata(i2c, max8998);