From: Robert Jarzmik Date: Sun, 3 Jun 2018 20:16:17 +0000 (+0200) Subject: mfd: wm97xx-core: Platform data can be NULL X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=46f107d0cb22b3f2b23d7fc7c50757f453a36508;p=linux.git mfd: wm97xx-core: Platform data can be NULL It is not mandatory that platform data is passed along the ac97 codec. Actually there are configuration without a battery connected to the ADC of the codec. This is for example the case for the PXA zylonite platform, so fix the NULL dereferencing by adding a test. Fixes: a5c6951c49fb ("mfd: wm97xx-core: core support for wm97xx Codec") Signed-off-by: Robert Jarzmik Signed-off-by: Lee Jones --- diff --git a/drivers/mfd/wm97xx-core.c b/drivers/mfd/wm97xx-core.c index 4141ee52a70b0..f5a8347f837f2 100644 --- a/drivers/mfd/wm97xx-core.c +++ b/drivers/mfd/wm97xx-core.c @@ -278,7 +278,7 @@ static int wm97xx_ac97_probe(struct ac97_codec_device *adev) codec_pdata = &wm97xx->codec_pdata; codec_pdata->ac97 = wm97xx->ac97; - codec_pdata->batt_pdata = pdata->batt_pdata; + codec_pdata->batt_pdata = pdata ? pdata->batt_pdata : NULL; switch (adev->vendor_id) { case WM9705_VENDOR_ID: