diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-12 18:49:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-12 18:49:29 -0400 |
| commit | cc49e8c9e66d4c52b121de0da666393c4140c0f2 (patch) | |
| tree | bf213afb91e09dbba66a5b51c5312b423e675884 /drivers/power/collie_battery.c | |
| parent | 4cfceaf0c087f47033f5e61a801f4136d6fb68c6 (diff) | |
| parent | 8ebb7e9c1a502cfc300618c19c3c6f06fc76d237 (diff) | |
Merge tag 'for-v4.1-rc' of git://git.infradead.org/battery-2.6
Pull power supply and reset fixes from Sebastian Reichel:
"misc fixes"
* tag 'for-v4.1-rc' of git://git.infradead.org/battery-2.6:
power: bq27x00_battery: Add missing MODULE_ALIAS
power: reset: Add MFD_SYSCON depends for brcmstb
power: reset: ltc2952: Remove bogus hrtimer_start() return value checks
power_supply: fix oops in collie_battery driver
power/reset: at91: fix return value check in at91_reset_platform_probe()
MAINTAINERS: Add me as maintainer of Nokia N900 power supply drivers
axp288_fuel_gauge: Add original author details
Diffstat (limited to 'drivers/power/collie_battery.c')
| -rw-r--r-- | drivers/power/collie_battery.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/collie_battery.c b/drivers/power/collie_battery.c index 2da9ed8ccbb5..8a971b3dbe58 100644 --- a/drivers/power/collie_battery.c +++ b/drivers/power/collie_battery.c | |||
| @@ -347,7 +347,7 @@ static int collie_bat_probe(struct ucb1x00_dev *dev) | |||
| 347 | goto err_psy_reg_main; | 347 | goto err_psy_reg_main; |
| 348 | } | 348 | } |
| 349 | 349 | ||
| 350 | psy_main_cfg.drv_data = &collie_bat_bu; | 350 | psy_bu_cfg.drv_data = &collie_bat_bu; |
| 351 | collie_bat_bu.psy = power_supply_register(&dev->ucb->dev, | 351 | collie_bat_bu.psy = power_supply_register(&dev->ucb->dev, |
| 352 | &collie_bat_bu_desc, | 352 | &collie_bat_bu_desc, |
| 353 | &psy_bu_cfg); | 353 | &psy_bu_cfg); |