[patch] power: battery: pointer math issue in gab_probe()

From: Dan Carpenter
Date: Sat Sep 29 2012 - 03:14:02 EST


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 <dan.carpenter@xxxxxxxxxx>
---
Casting to void * would also work on GCC, at least.

diff --git a/drivers/power/generic-adc-battery.c b/drivers/power/generic-adc-battery.c
index 9bdf444..776f118 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/