kernel/linux.git/drivers/power, branch linux-2.6.35.y

ds2760_battery: Fix calculation of time_to_empty_now

2011-03-31T18:57:50+00:00

commit 86af95039b69a90db15294eb1f9c147f1df0a8ea upstream. A check against division by zero was modified in commit b0525b48. Since this change time_to_empty_now is always reported as zero while the battery is discharging and as a negative value while the battery is charging. This is because current is negative while the battery is discharging. Fix the check introduced by commit b0525b48 so that time_to_empty_now is reported correctly during discharge and as zero while charging. Signed-off-by: Sven Neumann Acked-by: Daniel Mack Signed-off-by: Anton Vorontsov Signed-off-by: Greg Kroah-Hartman Signed-off-by: Andi Kleen

olpc_battery: Fix endian neutral breakage for s16 values

2010-12-14T22:40:05+00:00

commit 7cfbb29466633e6ecdc14f76a693c8478c2b22af upstream. When the driver was updated to be endian neutral (8e9c7716c) the signed part of the s16 values was lost. This is because be16_to_cpu() returns an unsigned value. This patch casts the values back to a s16 number prior to the the implicit cast up to an int. Signed-off-by: Richard A. Smith Signed-off-by: Daniel Drake Signed-off-by: Anton Vorontsov Signed-off-by: Greg Kroah-Hartman Signed-off-by: Andi Kleen

apm_power: Add missing break statement

2010-09-20T20:36:46+00:00

commit 1d220334d6a8a711149234dc5f98d34ae02226b8 upstream. The missing break statement causes wrong capacity calculation for batteries that report energy. Reported-by: d binderman Signed-off-by: Anton Vorontsov Signed-off-by: Greg Kroah-Hartman

Merge git://git.infradead.org/users/cbou/battery-2.6.35

2010-07-27T16:22:55+00:00

* git://git.infradead.org/users/cbou/battery-2.6.35: ds2782_battery: Rename get_current to fix build failure / name conflict

Merge git://git.infradead.org/users/cbou/battery-2.6.35

2010-07-20T15:22:15+00:00

* git://git.infradead.org/users/cbou/battery-2.6.35: ds2782_battery: Fix ds2782_get_capacity return value

ds2782_battery: Fix ds2782_get_capacity return value

2010-06-21T15:13:36+00:00

The ds2782_get_capacity function should return 0 on success, not the capacity value. Signed-off-by: Ryan Mallon Signed-off-by: Anton Vorontsov

ds2782_battery: Rename get_current to fix build failure / name conflict

2010-06-14T15:33:22+00:00

This patch changes the name of get_current function pointer to get_battery_current to resolve a name conflict with the get_current macro defined in current.h. This conflict resulted in a build-failure[1] for the sh4 arch allyesconfig: drivers/power/ds2782_battery.c:216:48: error: macro "get_current" passed 2 arguments, but takes just This patch fixes the issue. To be consistent the other function pointers (_voltage,_capacity) were renamed too. Signed-off-by: Peter Huewe Acked-by: Ryan Mallon Acked-by: Mike Rapoport Signed-off-by: Anton Vorontsov

[ARM] pxa/z2: fix missing include in battery driver

2010-06-13T15:55:13+00:00

Remove redundant includes and add slab.h to fix problem with building. Signed-off-by: Marek Vasut Signed-off-by: Eric Miao

i2c: Remove all i2c_set_clientdata(client, NULL) in drivers

2010-06-03T09:33:58+00:00

I2C drivers can use the clientdata-pointer to point to private data. As I2C devices are not really unregistered, but merely detached from their driver, it used to be the drivers obligation to clear this pointer during remove() or a failed probe(). As a couple of drivers forgot to do this, it was agreed that it was cleaner if the i2c-core does this clearance when appropriate, as there is no guarantee for the lifetime of the clientdata-pointer after remove() anyhow. This feature was added to the core with commit e4a7b9b04de15f6b63da5ccdd373ffa3057a3681 to fix the faulty drivers. As there is no need anymore to clear the clientdata-pointer, remove all current occurrences in the drivers to simplify the code and prevent confusion. Signed-off-by: Wolfram Sang Acked-by: Mark Brown Acked-by: Greg Kroah-Hartman Acked-by: Richard Purdie Acked-by: Dmitry Torokhov Signed-off-by: Jean Delvare

Merge git://git.infradead.org/battery-2.6

2010-05-25T15:16:34+00:00

* git://git.infradead.org/battery-2.6: power_supply: Fix regression for 'type' property