diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2017-07-05 07:50:54 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2017-09-05 09:46:00 +0200 |
| commit | 2042f3c29f2f11129434de8a610878e8a15b4174 (patch) | |
| tree | 75fe955c2a9a9298794cb9e5d672301a4ece2386 /drivers | |
| parent | mfd: max8925-i2c: Drop unnecessary static (diff) | |
| download | linux-2042f3c29f2f11129434de8a610878e8a15b4174.tar.xz linux-2042f3c29f2f11129434de8a610878e8a15b4174.zip | |
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: ee999fb3f17f("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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mfd/max8998.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c index 4c33b8063bc3..b1d3f70782d9 100644 --- a/drivers/mfd/max8998.c +++ b/drivers/mfd/max8998.c @@ -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); |