diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2013-11-07 11:04:20 +0300 |
|---|---|---|
| committer |   Lee Jones <lee.jones@linaro.org> | 2013-11-11 11:22:19 +0000 |
| commit | d6daef95127e41233ac8e2d8472d8c0cd8687d38 (patch) | |
| tree | 6c7794b5eaced7e3d7d3d1f092d5574917ace27f /drivers/mfd/pm8921-core.c | |
| parent | mfd: Fix memory leak in mfd_add_devices() (diff) | |
| download | linux-dev-d6daef95127e41233ac8e2d8472d8c0cd8687d38.tar.xz linux-dev-d6daef95127e41233ac8e2d8472d8c0cd8687d38.zip | |
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: c013f0a56c56 ('mfd: Add pm8xxx irq support')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/pm8921-core.c')
| -rw-r--r-- | drivers/mfd/pm8921-core.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/mfd/pm8921-core.c b/drivers/mfd/pm8921-core.c index a6841f77aa5e..484fe66e6c88 100644 --- a/drivers/mfd/pm8921-core.c +++ b/drivers/mfd/pm8921-core.c @@ -171,11 +171,12 @@ static int pm8921_remove(struct platform_device *pdev) drvdata = platform_get_drvdata(pdev); if (drvdata) pmic = drvdata->pm_chip_data; - if (pmic) + if (pmic) { mfd_remove_devices(pmic->dev); - if (pmic->irq_chip) { - pm8xxx_irq_exit(pmic->irq_chip); - pmic->irq_chip = NULL; + if (pmic->irq_chip) { + pm8xxx_irq_exit(pmic->irq_chip); + pmic->irq_chip = NULL; + } } return 0; |