Commit 898c0a15 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Miguel Ojeda

auxdisplay: lcd2s: Fix memory leak in ->remove()

Once allocated the struct lcd2s_data is never freed.
Fix the memory leak by switching to devm_kzalloc().

Fixes: 8c9108d0 ("auxdisplay: add a driver for lcd2s character display")
Cc: Lars Poeschel <poeschel@lemonage.de>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarMiguel Ojeda <ojeda@kernel.org>
parent 4424c35e
...@@ -298,6 +298,10 @@ static int lcd2s_i2c_probe(struct i2c_client *i2c, ...@@ -298,6 +298,10 @@ static int lcd2s_i2c_probe(struct i2c_client *i2c,
I2C_FUNC_SMBUS_WRITE_BLOCK_DATA)) I2C_FUNC_SMBUS_WRITE_BLOCK_DATA))
return -EIO; return -EIO;
lcd2s = devm_kzalloc(&i2c->dev, sizeof(*lcd2s), GFP_KERNEL);
if (!lcd2s)
return -ENOMEM;
/* Test, if the display is responding */ /* Test, if the display is responding */
err = lcd2s_i2c_smbus_write_byte(i2c, LCD2S_CMD_DISPLAY_OFF); err = lcd2s_i2c_smbus_write_byte(i2c, LCD2S_CMD_DISPLAY_OFF);
if (err < 0) if (err < 0)
...@@ -307,12 +311,6 @@ static int lcd2s_i2c_probe(struct i2c_client *i2c, ...@@ -307,12 +311,6 @@ static int lcd2s_i2c_probe(struct i2c_client *i2c,
if (!lcd) if (!lcd)
return -ENOMEM; return -ENOMEM;
lcd2s = kzalloc(sizeof(struct lcd2s_data), GFP_KERNEL);
if (!lcd2s) {
err = -ENOMEM;
goto fail1;
}
lcd->drvdata = lcd2s; lcd->drvdata = lcd2s;
lcd2s->i2c = i2c; lcd2s->i2c = i2c;
lcd2s->charlcd = lcd; lcd2s->charlcd = lcd;
...@@ -321,24 +319,22 @@ static int lcd2s_i2c_probe(struct i2c_client *i2c, ...@@ -321,24 +319,22 @@ static int lcd2s_i2c_probe(struct i2c_client *i2c,
err = device_property_read_u32(&i2c->dev, "display-height-chars", err = device_property_read_u32(&i2c->dev, "display-height-chars",
&lcd->height); &lcd->height);
if (err) if (err)
goto fail2; goto fail1;
err = device_property_read_u32(&i2c->dev, "display-width-chars", err = device_property_read_u32(&i2c->dev, "display-width-chars",
&lcd->width); &lcd->width);
if (err) if (err)
goto fail2; goto fail1;
lcd->ops = &lcd2s_ops; lcd->ops = &lcd2s_ops;
err = charlcd_register(lcd2s->charlcd); err = charlcd_register(lcd2s->charlcd);
if (err) if (err)
goto fail2; goto fail1;
i2c_set_clientdata(i2c, lcd2s); i2c_set_clientdata(i2c, lcd2s);
return 0; return 0;
fail2:
kfree(lcd2s);
fail1: fail1:
kfree(lcd); kfree(lcd);
return err; return err;
......
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