regulator: fan53555: Fixup report wrong vendor message
PATCH 1/2 regulator: fan53555: Fixup report wrong vendor message
Signed-off-by Axel Lin <[email protected]>
--- drivers/regulator/fan53555.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/regulator/fan53555.c +1 -2
@@ -267,8 +267,7 @@ static int fan53555_device_setup(struct fan53555_device_info *di, ret =fan53555_voltages_setup_silergy (di);break ;default : -dev_err (di->dev, -"vendor %d not supported!\n" , di->chip_id); +dev_err (di->dev,"vendor %d not supported!\n" , di->vendor);return -EINVAL ; }
Signature · 1 line
1.9.1
PATCH 2/2 regulator: fan53555: Fix null pointer dereference
Set di->regulator before dereference it.
Signed-off-by Axel Lin <[email protected]>
--- drivers/regulator/fan53555.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/fan53555.c +1 -1
@@ -361,6 +361,7 @@ static int fan53555_regulator_probe(struct i2c_client *client,if (!di)return -ENOMEM ; + di->regulator = pdata->regulator;if (client->dev.of_node) {const struct of_device_id *match;
@@ -389,7 +390,6 @@ static int fan53555_regulator_probe(struct i2c_client *client,return PTR_ERR (di->regmap); } di->dev = &client->dev; - di->regulator = pdata->regulator;i2c_set_clientdata (client, di);/* Get chip ID */ ret =regmap_read (di->regmap,FAN53555_ID1 , &val);
Signature · 1 line
1.9.1
Re: [PATCH 2/2] regulator: fan53555: Fix null pointer dereference
Am Donnerstag, 18. September 2014, 21:49:38 schrieb Axel Lin:
Quoted 3 lines
Set
di->regulatorbefore dereference it.Signed-off-by Axel Lin <[email protected]>
damn ... thanks for catching this :-)
Reviewed-by Heiko Stuebner <[email protected]>
Quoted 24 lines
--- drivers/regulator/fan53555.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/regulator/fan53555.c +1
-1@@ -361,6 +361,7 @@ static int fan53555_regulator_probe(struct i2c_client *client, if (!di) return -ENOMEM; + di->regulator = pdata->regulator;if (client->dev.of_node) {const struct of_device_id *match;@@ -389,7 +390,6 @@ static int fan53555_regulator_probe(struct i2c_client *client, return PTR_ERR(di->regmap); } di->dev = &client->dev; - di->regulator = pdata->regulator;i2c_set_clientdata (client, di);/* Get chip ID */ ret =regmap_read (di->regmap,FAN53555_ID1 , &val);
Am Donnerstag, 18. September 2014, 21:48:48 schrieb Axel Lin:
Quoted 1 line
Signed-off-by Axel Lin <[email protected]>
thanks for catching this silly mistake
Reviewed-by Heiko Stuebner <[email protected]>
Quoted 17 lines
--- drivers/regulator/fan53555.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/regulator/fan53555.c +1
-2@@ -267,8 +267,7 @@ static int fan53555_device_setup(structfan53555_device_info *di, ret =fan53555_voltages_setup_silergy (di);break ;default : -dev_err (di->dev, -"vendor %d not supported!\n" , di->chip_id); +dev_err (di->dev,"vendor %d not supported!\n" , di->vendor);return -EINVAL ; }
Quoted 1 line · Axel Lin
Signed-off-by Axel Lin <[email protected]>
Applied both, thanks.