diff options
| author |   Rui Miguel Silva <rui.silva@linaro.org> | 2016-01-08 13:53:46 +0000 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@google.com> | 2016-01-11 19:18:14 -0800 |
| commit | f921fb139bd5ee008ec993c76b8a89a535fd11e9 (patch) | |
| tree | 726e26a1f65cf713838bd6f9b3e1b00f2d47ece2 /drivers/staging/greybus/power_supply.c | |
| parent | greybus: power_supply: fix error path at supplies setup (diff) | |
| download | linux-dev-f921fb139bd5ee008ec993c76b8a89a535fd11e9.tar.xz linux-dev-f921fb139bd5ee008ec993c76b8a89a535fd11e9.zip | |
greybus: power_supply: fix leak getting string properties
When fetching string properties, memory was being allocated and leaked
when it was not necessary to do so.
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
Reviewed-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'drivers/staging/greybus/power_supply.c')
| -rw-r--r-- | drivers/staging/greybus/power_supply.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/staging/greybus/power_supply.c b/drivers/staging/greybus/power_supply.c index 28548a243240..3c9bb12351e4 100644 --- a/drivers/staging/greybus/power_supply.c +++ b/drivers/staging/greybus/power_supply.c @@ -347,15 +347,13 @@ static int __gb_power_supply_property_strval_get(struct gb_power_supply *gbpsy, { switch (psp) { case POWER_SUPPLY_PROP_MODEL_NAME: - val->strval = kstrndup(gbpsy->model_name, PROP_MAX, GFP_KERNEL); + val->strval = gbpsy->model_name; break; case POWER_SUPPLY_PROP_MANUFACTURER: - val->strval = kstrndup(gbpsy->manufacturer, PROP_MAX, - GFP_KERNEL); + val->strval = gbpsy->manufacturer; break; case POWER_SUPPLY_PROP_SERIAL_NUMBER: - val->strval = kstrndup(gbpsy->serial_number, PROP_MAX, - GFP_KERNEL); + val->strval = gbpsy->serial_number; break; default: break; |