summaryrefslogtreecommitdiffstats
path: root/drivers/eeprom
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2016-05-30 11:39:52 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2016-05-31 08:57:46 +0200
commit3982f4ad8a3d755959d36905d1528a6820faadfe (patch)
tree69d52d63a6076d11441b7306be20ae8383350c73 /drivers/eeprom
parenta20a3cb4cd7a16a7f90028469cc9e8060d4b4ef0 (diff)
downloadbarebox-3982f4ad8a3d755959d36905d1528a6820faadfe.tar.gz
barebox-3982f4ad8a3d755959d36905d1528a6820faadfe.tar.xz
eeprom: at24: check return value of devfs_create and fix error path
if devfs_create failed because "eeprom0" already exists of_parse_partitions must not be called, otherwise the already existing eeprom gets assigned partitions that don't belog there. Also free dummy clients in the error path and the write protect gpio only if it is actually valid. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/eeprom')
-rw-r--r--drivers/eeprom/at24.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/eeprom/at24.c b/drivers/eeprom/at24.c
index a323d25dd4..0f54d1b6de 100644
--- a/drivers/eeprom/at24.c
+++ b/drivers/eeprom/at24.c
@@ -480,14 +480,21 @@ static int at24_probe(struct device_d *dev)
}
}
- devfs_create(&at24->cdev);
+ err = devfs_create(&at24->cdev);
+ if (err)
+ goto err_devfs_create;
of_parse_partitions(&at24->cdev, dev->device_node);
return 0;
+err_devfs_create:
err_clients:
- gpio_free(at24->wp_gpio);
+ for (i = 1; i < num_addresses; i++)
+ kfree(at24->client[i]);
+
+ if (gpio_is_valid(at24->wp_gpio))
+ gpio_free(at24->wp_gpio);
kfree(at24->writebuf);
kfree(at24);
err_out: