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
Unified · Split
| @@ -152,6 +152,7 @@ config BATTERY_SBS · 151 unmodified lines | |||
| 152 | 152 | ||
| 153 | config BATTERY_BQ27x00 | 153 | config BATTERY_BQ27x00 |
| 154 | tristate "BQ27x00 battery driver" | 154 | tristate "BQ27x00 battery driver" |
| 155 | depends on I2C || I2C=n | ||
| 155 | help | 156 | help |
| 156 | Say Y here to enable support for batteries with BQ27x00 (I2C/HDQ) chips. | 157 | Say Y here to enable support for batteries with BQ27x00 (I2C/HDQ) chips. |
| 157 | 158 | ||
| @@ -284,6 +285,7 @@ config CHARGER_LP8788 · 126 unmodified lines | |||
| 284 | tristate "TI LP8788 charger driver" | 285 | tristate "TI LP8788 charger driver" |
| 285 | depends on MFD_LP8788 | 286 | depends on MFD_LP8788 |
| 286 | depends on LP8788_ADC | 287 | depends on LP8788_ADC |
| 288 | depends on IIO | ||
| 287 | help | 289 | help |
| 288 | Say Y to enable support for the LP8788 linear charger. | 290 | Say Y to enable support for the LP8788 linear charger. |
| 289 | 291 | ||
| @@ -1269,5 +1269,5 @@ module_exit(pm2xxx_charger_exit); · 1268 unmodified lines | |||
| 1269 | 1269 | ||
| 1270 | MODULE_LICENSE("GPL v2"); | 1270 | MODULE_LICENSE("GPL v2"); |
| 1271 | MODULE_AUTHOR("Rajkumar kasirajan, Olivier Launay"); | 1271 | MODULE_AUTHOR("Rajkumar kasirajan, Olivier Launay"); |
| 1272 | MODULE_ALIAS("platform:pm2xxx-charger"); | 1272 | MODULE_ALIAS("i2c:pm2xxx-charger"); |
| 1273 | MODULE_DESCRIPTION("PM2xxx charger management driver"); | 1273 | MODULE_DESCRIPTION("PM2xxx charger management driver"); |
| @@ -207,7 +207,6 @@ static int wm831x_backup_remove(struct platform_device *pdev) · 206 unmodified lines | |||
| 207 | struct wm831x_backup *devdata = platform_get_drvdata(pdev); | 207 | struct wm831x_backup *devdata = platform_get_drvdata(pdev); |
| 208 | 208 | ||
| 209 | power_supply_unregister(&devdata->backup); | 209 | power_supply_unregister(&devdata->backup); |
| 210 | kfree(devdata->backup.name); | ||
| 211 | 210 | ||
| 212 | return 0; | 211 | return 0; |
| 213 | } | 212 | } |