Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72de4c63 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 1aad08dc dccab609

drivers/power/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ config BATTERY_SBS 


config BATTERY_BQ27x00

	tristate "BQ27x00 battery driver"

	depends on I2C || I2C=n

	help

	  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"

	depends on MFD_LP8788

	depends on LP8788_ADC

	depends on IIO

	help

	  Say Y to enable support for the LP8788 linear charger.

drivers/power/pm2301_charger.c

+1 −1
Original line number Diff line number Diff line
@@ -1269,5 +1269,5 @@ module_exit(pm2xxx_charger_exit); 


MODULE_LICENSE("GPL v2");

MODULE_AUTHOR("Rajkumar kasirajan, Olivier Launay");

MODULE_ALIAS("platform:pm2xxx-charger");

MODULE_ALIAS("i2c:pm2xxx-charger");

MODULE_DESCRIPTION("PM2xxx charger management driver");

drivers/power/wm831x_backup.c

+0 −1
Original line number Diff line number Diff line
@@ -207,7 +207,6 @@ static int wm831x_backup_remove(struct platform_device *pdev) 
	struct wm831x_backup *devdata = platform_get_drvdata(pdev);



	power_supply_unregister(&devdata->backup);

	kfree(devdata->backup.name);



	return 0;

}