diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-07-11 07:58:33 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-07-11 07:58:33 +0200 |
| commit | f64075972b8dc4ec4a701506e5fe8075113d3c4a (patch) | |
| tree | e8c13889eec312fcb7e32ed040017a16204bd005 /drivers/eeprom | |
| parent | e54183d6d4eb575051e67a020094787c113f238d (diff) | |
| parent | b06ecabed947ed778ee2f271c0cb0cc8c4483f5d (diff) | |
| download | barebox-f64075972b8dc4ec4a701506e5fe8075113d3c4a.tar.gz barebox-f64075972b8dc4ec4a701506e5fe8075113d3c4a.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/eeprom')
| -rw-r--r-- | drivers/eeprom/at24.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/eeprom/at24.c b/drivers/eeprom/at24.c index fd6307d8ac..4ae3776554 100644 --- a/drivers/eeprom/at24.c +++ b/drivers/eeprom/at24.c @@ -441,12 +441,7 @@ static int at24_probe(struct device_d *dev) dev_err(&client->dev, "no index found to name device\n"); goto err_device_name; } - devname = basprintf("eeprom%d", err); - if (!devname) { - err = -ENOMEM; - dev_err(&client->dev, "failed to allocate space for device name\n"); - goto err_device_name; - } + devname = xasprintf("eeprom%d", err); } at24->cdev.name = devname; |