lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'for-v3.10-fixes' of git://git.infradead.org/battery-2.6

Browse Source 
Pull bettery fixes from Anton Vorontsov:
 "Last minute one-liners: wrong kfree usage fix, module alias fixup and
  kconfig adjustments"

* tag 'for-v3.10-fixes' of git://git.infradead.org/battery-2.6:
  pm2301_charger: Fix module alias prefix
  wm831x_backup: Fix wrong kfree call for devdata->backup.name
  bq27x00: Fix I2C dependency in KConfig
  lp8788-charger: Fix kconfig dependency
This commit is contained in:
Linus Torvalds
2013-05-25 20:32:49 -07:00
parent 1aad08dc57 dccab6092d
commit 72de4c63e5
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/power/Kconfig
View File

@@ -152,6 +152,7 @@ config BATTERY_SBS
config BATTERY_BQ27x00 config BATTERY_BQ27x00
tristate "BQ27x00 battery driver" tristate "BQ27x00 battery driver"
depends on I2C || I2C=n
help help
Say Y here to enable support for batteries with BQ27x00 (I2C/HDQ) chips. Say Y here to enable support for batteries with BQ27x00 (I2C/HDQ) chips.
@@ -284,6 +285,7 @@ config CHARGER_LP8788
tristate "TI LP8788 charger driver" tristate "TI LP8788 charger driver"
depends on MFD_LP8788 depends on MFD_LP8788
depends on LP8788_ADC depends on LP8788_ADC
depends on IIO
help help
Say Y to enable support for the LP8788 linear charger. Say Y to enable support for the LP8788 linear charger.

2
drivers/power/pm2301_charger.c
View File

@@ -1269,5 +1269,5 @@ module_exit(pm2xxx_charger_exit);
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Rajkumar kasirajan, Olivier Launay"); MODULE_AUTHOR("Rajkumar kasirajan, Olivier Launay");
MODULE_ALIAS("platform:pm2xxx-charger"); MODULE_ALIAS("i2c:pm2xxx-charger");
MODULE_DESCRIPTION("PM2xxx charger management driver"); MODULE_DESCRIPTION("PM2xxx charger management driver");

1
drivers/power/wm831x_backup.c
View File

@@ -207,7 +207,6 @@ static int wm831x_backup_remove(struct platform_device *pdev)
struct wm831x_backup *devdata = platform_get_drvdata(pdev); struct wm831x_backup *devdata = platform_get_drvdata(pdev);
power_supply_unregister(&devdata->backup); power_supply_unregister(&devdata->backup);
kfree(devdata->backup.name);
return 0; return 0;
} }