Commit 395b2288 authored by Wolfram Sang's avatar Wolfram Sang Committed by David Woodhouse

mtd/maps/pismo: remove dangling pointer and a leak

While looking for drivers which forgot to clear i2c_clientdata before freeing
the data structure it points to, I found that the pismo driver even has a leak
on the probe error path.
Signed-off-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Acked-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 4d682420
...@@ -233,6 +233,7 @@ static int __devexit pismo_remove(struct i2c_client *client) ...@@ -233,6 +233,7 @@ static int __devexit pismo_remove(struct i2c_client *client)
/* FIXME: set_vpp needs saner arguments */ /* FIXME: set_vpp needs saner arguments */
pismo_setvpp_remove_fix(pismo); pismo_setvpp_remove_fix(pismo);
i2c_set_clientdata(client, NULL);
kfree(pismo); kfree(pismo);
return 0; return 0;
...@@ -271,7 +272,7 @@ static int __devinit pismo_probe(struct i2c_client *client, ...@@ -271,7 +272,7 @@ static int __devinit pismo_probe(struct i2c_client *client,
ret = pismo_eeprom_read(client, &eeprom, 0, sizeof(eeprom)); ret = pismo_eeprom_read(client, &eeprom, 0, sizeof(eeprom));
if (ret < 0) { if (ret < 0) {
dev_err(&client->dev, "error reading EEPROM: %d\n", ret); dev_err(&client->dev, "error reading EEPROM: %d\n", ret);
return ret; goto exit_free;
} }
dev_info(&client->dev, "%.15s board found\n", eeprom.board); dev_info(&client->dev, "%.15s board found\n", eeprom.board);
...@@ -282,6 +283,11 @@ static int __devinit pismo_probe(struct i2c_client *client, ...@@ -282,6 +283,11 @@ static int __devinit pismo_probe(struct i2c_client *client,
pdata->cs_addrs[i]); pdata->cs_addrs[i]);
return 0; return 0;
exit_free:
i2c_set_clientdata(client, NULL);
kfree(pismo);
return ret;
} }
static const struct i2c_device_id pismo_id[] = { static const struct i2c_device_id pismo_id[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment