From a77d60aec70183faa68b7df4a3fa89fbaf592cf5 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Sat, 29 Sep 2012 10:13:46 +0300 Subject: generic-adc-battery: Pointer math issue in gab_probe() psy->properties is an enum (32 bit type) so adding sizeof() puts us four times further along than we intended. It should be cast to a char pointer before doing the math. Signed-off-by: Dan Carpenter Signed-off-by: Anton Vorontsov --- drivers/power/generic-adc-battery.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/power/generic-adc-battery.c b/drivers/power/generic-adc-battery.c index 4a00ef7a879..ecbf672a35d 100644 --- a/drivers/power/generic-adc-battery.c +++ b/drivers/power/generic-adc-battery.c @@ -279,7 +279,8 @@ static int __devinit gab_probe(struct platform_device *pdev) } memcpy(psy->properties, gab_props, sizeof(gab_props)); - properties = psy->properties + sizeof(gab_props); + properties = (enum power_supply_property *) + ((char *)psy->properties + sizeof(gab_props)); /* * getting channel from iio and copying the battery properties -- cgit v1.2.3-70-g09d2