diff options
| author | Linus Torvalds | 2016-12-14 11:18:51 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2016-12-14 11:18:51 -0800 |
| commit | bbcd9c53c743cfee9feb0ee3b25070691d76c5ee (patch) | |
| tree | edca636a488f1192f6c886f80455c9bb6bdbefd6 /drivers/input | |
| parent | ce38207f161513ee3d2bd3860489f07ebe65bc78 (diff) | |
| parent | 6480af4915d6ffb66afc39eee4e9e66cbf59b938 (diff) | |
Merge tag 'for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull power supply and reset updates from Sebastian Reichel:
- new driver for Intel PIIX4
- lots of module autoload fixes
- misc fixes
* tag 'for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
power_supply: wm97xx_battery: use power_supply_get_drvdata
wm8350_power: use permission-specific DEVICE_ATTR variants
power: ipaq_micro_battery: fix alias
power: supply: bq27xxx_battery: Fix register map for BQ27510 and BQ27520
bq24190_charger: Fix PM runtime use for bq24190_battery_set_property
power: supply: lp8788: remove an unneeded NULL check
power: reset: zx-reboot: Fix module autoload
power: reset: syscon-reboot-mode: Fix module autoload
power: reset: at91-poweroff: Fix module autoload
power: reset: at91-reset: Fix module autoload
power: supply: axp288_fuel_gauge: Fix module autoload
power: supply: max8997_charger: Fix module autoload
power: supply: max17040: Change register transaction length from 8 bits to 16 bits
power: supply: bq27xxx_battery: don't update poll_interval param if same
power: supply: improve function-level documentation
power: reset: Add Intel PIIX4 poweroff driver
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/touchscreen/wm97xx-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/wm97xx-core.c b/drivers/input/touchscreen/wm97xx-core.c index 90d6be3c26cc..83cf11312fd9 100644 --- a/drivers/input/touchscreen/wm97xx-core.c +++ b/drivers/input/touchscreen/wm97xx-core.c @@ -682,7 +682,7 @@ static int wm97xx_probe(struct device *dev) } platform_set_drvdata(wm->battery_dev, wm); wm->battery_dev->dev.parent = dev; - wm->battery_dev->dev.platform_data = pdata; + wm->battery_dev->dev.platform_data = pdata->batt_pdata; ret = platform_device_add(wm->battery_dev); if (ret < 0) goto batt_reg_err; |