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

Commit 3f5c34c6 authored by Manuel Lauss's avatar Manuel Lauss Committed by Dmitry Torokhov
Browse files

Input: wm97xx - make missing platform data non-fatal 



Commit 6480af49 ("power_supply: wm97xx_battery: use
power_supply_get_drvdata") made wm97xx platform data mandatory, although
it's still optional.

This patch fixes an oops during driver probe on one of my MIPS boards with
a wm9712.

Signed-off-by: default avatarManuel Lauss <manuel.lauss@gmail.com>
Reviewed-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 62ed8ced

drivers/input/touchscreen/wm97xx-core.c

+1 −1
Original line number Diff line number Diff line
@@ -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;