evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mfd: max77686: Init max77686->dev before using it

Browse source 
Current code uses max77686->dev in the dev_err call before setting it to
&i2c->dev. Fix it.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Axel Lin 2012-12-25 00:16:43 +08:00 • committed by Samuel Ortiz
parent 89d9b1c993
commit 136d982eca
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/mfd/max77686.c
View file

@ -93,15 +93,6 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
if (max77686 == NULL) if (max77686 == NULL)
return -ENOMEM; return -ENOMEM;
max77686->regmap = regmap_init_i2c(i2c, &max77686_regmap_config);
if (IS_ERR(max77686->regmap)) {
ret = PTR_ERR(max77686->regmap);
dev_err(max77686->dev, "Failed to allocate register map: %d\n",
ret);
kfree(max77686);
return ret;
}
i2c_set_clientdata(i2c, max77686); i2c_set_clientdata(i2c, max77686);
max77686->dev = &i2c->dev; max77686->dev = &i2c->dev;
max77686->i2c = i2c; max77686->i2c = i2c;
@ -111,6 +102,15 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
max77686->irq_gpio = pdata->irq_gpio; max77686->irq_gpio = pdata->irq_gpio;
max77686->irq = i2c->irq; max77686->irq = i2c->irq;
max77686->regmap = regmap_init_i2c(i2c, &max77686_regmap_config);
if (IS_ERR(max77686->regmap)) {
ret = PTR_ERR(max77686->regmap);
dev_err(max77686->dev, "Failed to allocate register map: %d\n",
ret);
kfree(max77686);
return ret;
}
if (regmap_read(max77686->regmap, if (regmap_read(max77686->regmap,
MAX77686_REG_DEVICE_ID, &data) < 0) { MAX77686_REG_DEVICE_ID, &data) < 0) {
dev_err(max77686->dev, dev_err(max77686->dev,