aboutsummaryrefslogtreecommitdiff
path: root/drivers/extcon
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>2014-04-09 15:20:14 +0200
committerJiri Slaby <jslaby@suse.cz>2014-07-02 12:06:03 +0200
commit7f75e8ac57444fa79191fbd108b82b383143e4ad (patch)
treec255cadbe2cdb8a730d4e609aa48b3cd65283954 /drivers/extcon
parent1485b05f2a2ff688d94e5e0196133c020efa861e (diff)
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: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers/extcon')
-rw-r--r--drivers/extcon/extcon-max8997.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c
index 67d6738d85a0..09f4a9374cf5 100644
--- a/drivers/extcon/extcon-max8997.c
+++ b/drivers/extcon/extcon-max8997.c
@@ -712,7 +712,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;