diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-14 09:25:59 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-14 09:25:59 -0800 |
commit | 5957e33d6aec266659a71cfabcf7cf2c593ad0d2 (patch) | |
tree | 6397dec8d71e4ed4f5982792c57d7c0ddb525d1e /drivers/power/power_supply_core.c | |
parent | 0ad53eeefcbb2620b6a71ffdaad4add20b450b8b (diff) | |
parent | 359ab9f5b154cbd807a11e22792235f0f36b0cd5 (diff) | |
download | kernel_samsung_tuna-5957e33d6aec266659a71cfabcf7cf2c593ad0d2.zip kernel_samsung_tuna-5957e33d6aec266659a71cfabcf7cf2c593ad0d2.tar.gz kernel_samsung_tuna-5957e33d6aec266659a71cfabcf7cf2c593ad0d2.tar.bz2 |
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6: (21 commits)
power_supply: Add MAX17042 Fuel Gauge Driver
olpc_battery: Fix up XO-1.5 properties list
olpc_battery: Add support for CURRENT_NOW and VOLTAGE_NOW
olpc_battery: Add support for CHARGE_NOW
olpc_battery: Add support for CHARGE_FULL_DESIGN
olpc_battery: Ambient temperature is not available on XO-1.5
jz4740-battery: Should include linux/io.h
s3c_adc_battery: Add gpio_inverted field to pdata
power_supply: Don't use flush_scheduled_work()
power_supply: Fix use after free and memory leak
gpio-charger: Fix potential race between irq handler and probe/remove
gpio-charger: Provide default name for the power_supply
gpio-charger: Check result of kzalloc
jz4740-battery: Check if platform_data is supplied
isp1704_charger: Detect charger after probe
isp1704_charger: Set isp->dev before anything needs it
isp1704_charger: Detect HUB/Host chargers
isp1704_charger: Correct length for storing model
power_supply: Add gpio charger driver
jz4740-battery: Protect against concurrent battery readings
...
Diffstat (limited to 'drivers/power/power_supply_core.c')
-rw-r--r-- | drivers/power/power_supply_core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c index 91606bb..970f733 100644 --- a/drivers/power/power_supply_core.c +++ b/drivers/power/power_supply_core.c @@ -190,10 +190,10 @@ int power_supply_register(struct device *parent, struct power_supply *psy) goto success; create_triggers_failed: - device_unregister(psy->dev); + device_del(dev); kobject_set_name_failed: device_add_failed: - kfree(dev); + put_device(dev); success: return rc; } @@ -201,7 +201,7 @@ EXPORT_SYMBOL_GPL(power_supply_register); void power_supply_unregister(struct power_supply *psy) { - flush_scheduled_work(); + cancel_work_sync(&psy->changed_work); power_supply_remove_triggers(psy); device_unregister(psy->dev); } |