Commit d6daef95 authored by Dan Carpenter's avatar Dan Carpenter Committed by Lee Jones

mfd: pm8921: Potential NULL dereference in pm8921_remove()

We assume that "pmic" could be NULL and then dereference it two lines
later.  I fix this by moving the dereference inside the NULL check.

Fixes: c013f0a5 ('mfd: Add pm8xxx irq support')
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 0b208e41
...@@ -171,12 +171,13 @@ static int pm8921_remove(struct platform_device *pdev) ...@@ -171,12 +171,13 @@ static int pm8921_remove(struct platform_device *pdev)
drvdata = platform_get_drvdata(pdev); drvdata = platform_get_drvdata(pdev);
if (drvdata) if (drvdata)
pmic = drvdata->pm_chip_data; pmic = drvdata->pm_chip_data;
if (pmic) if (pmic) {
mfd_remove_devices(pmic->dev); mfd_remove_devices(pmic->dev);
if (pmic->irq_chip) { if (pmic->irq_chip) {
pm8xxx_irq_exit(pmic->irq_chip); pm8xxx_irq_exit(pmic->irq_chip);
pmic->irq_chip = NULL; pmic->irq_chip = NULL;
} }
}
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment