From mboxrd@z Thu Jan 1 00:00:00 1970 From: Manuel Lauss Subject: [PATCH RESEND] input/wm97xx: make missing platform data non-fatal Date: Thu, 19 Jan 2017 09:43:53 +0100 Message-ID: <20170119084353.4250-1-manuel.lauss@gmail.com> Return-path: Received: from mail-wm0-f67.google.com ([74.125.82.67]:35919 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751256AbdASIn6 (ORCPT ); Thu, 19 Jan 2017 03:43:58 -0500 Received: by mail-wm0-f67.google.com with SMTP id r126so10290765wmr.3 for ; Thu, 19 Jan 2017 00:43:58 -0800 (PST) Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: linux-input@vger.kernel.org Cc: Manuel Lauss , patches@opensource.wolfsonmicro.com, Robert Jarzmik Commit 6480af4915d6 ("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. Touchscreen continues to work fine, and I don't have any battery hooked up to it either, so I'm not missing any functionality. Signed-off-by: Manuel Lauss Cc: linux-input@vger.kernel.org Cc: patches@opensource.wolfsonmicro.com Cc: Robert Jarzmik --- Resend, added Maintainers to Cc. drivers/input/touchscreen/wm97xx-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/input/touchscreen/wm97xx-core.c b/drivers/input/touchscreen/wm97xx-core.c index 83cf11312fd9..c9d1c91e1887 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->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; -- 2.11.0