diff options
| author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2014-04-09 15:20:14 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-30 20:13:52 -0700 |
| commit | 98841cadfdb8e4cecd25eedaaf31f42af982c758 (patch) | |
| tree | b23a6095a0db9cd34026b1020fd4ed0a026faf24 | |
| parent | ed950366acc7694b514a43878b41a1392d89bd19 (diff) | |
| download | lwn-98841cadfdb8e4cecd25eedaaf31f42af982c758.tar.gz lwn-98841cadfdb8e4cecd25eedaaf31f42af982c758.zip | |
extcon: max8997: Fix NULL pointer exception on missing pdata
commit dfee4111febf3d9ef3a640b2cd6205c75f4e7e3d upstream.
Fix NULL pointer exception when platform data is not supplied. The
driver dereferenced pdata pointer where it could be NULL.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Fixes: 810d601f07c
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/extcon/extcon-max8997.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c index 6a00464658c5..5e1b88cecb76 100644 --- a/drivers/extcon/extcon-max8997.c +++ b/drivers/extcon/extcon-max8997.c @@ -715,7 +715,7 @@ static int max8997_muic_probe(struct platform_device *pdev) goto err_irq; } - if (pdata->muic_pdata) { + if (pdata && pdata->muic_pdata) { struct max8997_muic_platform_data *muic_pdata = pdata->muic_pdata; |