History

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

Linus Torvalds committed 13 years ago

Commit 72de4c62 parents 1aad08d dccab603 files · +3 −2Browse files

Unified · Split

3 files
  1. drivers/power/Kconfig +2 −0
  2. drivers/power/pm2301_charger.c +1 −1
  3. drivers/power/wm831x_backup.c +0 −1
drivers/power/Kconfig+2−0
@@ -152,6 +152,7 @@ config BATTERY_SBS · 151 unmodified lines
152152
153153 config BATTERY_BQ27x00
154154 tristate "BQ27x00 battery driver"
155+ depends on I2C || I2C=n
155156 help
156157 Say Y here to enable support for batteries with BQ27x00 (I2C/HDQ) chips.
157158
@@ -284,6 +285,7 @@ config CHARGER_LP8788 · 126 unmodified lines
284285 tristate "TI LP8788 charger driver"
285286 depends on MFD_LP8788
286287 depends on LP8788_ADC
288+ depends on IIO
287289 help
288290 Say Y to enable support for the LP8788 linear charger.
289291
drivers/power/pm2301_charger.c+1−1
@@ -1269,5 +1269,5 @@ module_exit(pm2xxx_charger_exit); · 1268 unmodified lines
12691269
12701270 MODULE_LICENSE("GPL v2");
12711271 MODULE_AUTHOR("Rajkumar kasirajan, Olivier Launay");
1272−MODULE_ALIAS("platform:pm2xxx-charger");
1272+MODULE_ALIAS("i2c:pm2xxx-charger");
12731273 MODULE_DESCRIPTION("PM2xxx charger management driver");
drivers/power/wm831x_backup.c+0−1
@@ -207,7 +207,6 @@ static int wm831x_backup_remove(struct platform_device *pdev) · 206 unmodified lines
207207 struct wm831x_backup *devdata = platform_get_drvdata(pdev);
208208
209209 power_supply_unregister(&devdata->backup);
210− kfree(devdata->backup.name);
211210
212211 return 0;
213212 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t