1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/mtd/maps/pismo.c b/drivers/mtd/maps/pismo.c
index 60c068db452d..eb476b7f8d11 100644
--- a/drivers/mtd/maps/pismo.c
+++ b/drivers/mtd/maps/pismo.c
@@ -234,6 +234,7 @@ static int __devexit pismo_remove(struct i2c_client *client)
         /* FIXME: set_vpp needs saner arguments */
         pismo_setvpp_remove_fix(pismo);
 
+        i2c_set_clientdata(client, NULL);
         kfree(pismo);
 
         return 0;
@@ -272,7 +273,7 @@ static int __devinit pismo_probe(struct i2c_client *client,
         ret = pismo_eeprom_read(client, &eeprom, 0, sizeof(eeprom));
         if (ret < 0) {
                 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);
@@ -283,6 +284,11 @@ static int __devinit pismo_probe(struct i2c_client *client,
                                       pdata->cs_addrs[i]);
 
         return 0;
+
+ exit_free:
+        i2c_set_clientdata(client, NULL);
+        kfree(pismo);
+        return ret;
 }
 
 static const struct i2c_device_id pismo_id[] = {