diff options
| author | Robert Jarzmik <robert.jarzmik@free.fr> | 2018-06-03 22:16:17 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2018-06-11 09:11:03 +0100 |
| commit | 46f107d0cb22b3f2b23d7fc7c50757f453a36508 (patch) | |
| tree | 2e378e566d07e99fe3f5daceaef9a20df81ba3b0 /drivers/mfd | |
| parent | df7c3bf24f546ab0e5a23b282d34850f2b8eb0d2 (diff) | |
| download | op-kernel-dev-46f107d0cb22b3f2b23d7fc7c50757f453a36508.zip op-kernel-dev-46f107d0cb22b3f2b23d7fc7c50757f453a36508.tar.gz | |
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 <robert.jarzmik@free.fr>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/wm97xx-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/wm97xx-core.c b/drivers/mfd/wm97xx-core.c index 4141ee5..f5a8347 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: |
