xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ib/4.10-sparse-keymap-managed' into next

Browse Source 
This brings in version of sparse keymap code that uses managed memory.
This commit is contained in:
Dmitry Torokhov
2017-03-09 10:03:22 -08:00
parent a01cd17000 fabeb165af
commit 7b179e251b
706 changed files with 6900 additions and 4262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/input/touchscreen/wm97xx-core.c
View File

@@ -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->batt_pdata;
wm->battery_dev->dev.platform_data = pdata ? pdata->batt_pdata : NULL;
ret = platform_device_add(wm->battery_dev);
if (ret < 0)
goto batt_reg_err;