diff options
| author | Mattias Wallin <mattias.wallin@stericsson.com> | 2010-12-02 15:08:32 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-01-14 12:37:46 +0100 |
| commit | 6bce7bf1a1f8a79a57ff69910c115e1d2ed8913d (patch) | |
| tree | 2ce014804679792a95e4ee7739951d09af8d989c /drivers/mfd | |
| parent | gpio/misc: Add MODULE_ALIAS entries for CS5535 functions (diff) | |
| download | linux-6bce7bf1a1f8a79a57ff69910c115e1d2ed8913d.tar.xz linux-6bce7bf1a1f8a79a57ff69910c115e1d2ed8913d.zip | |
mfd: ab8500-core improved error handling in get_chip_id
We check for dev before dereferencing it.
Signed-off-by: Mattias Wallin <mattias.wallin@stericsson.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/ab8500-core.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c index d9640a623ff4..e91b5b759004 100644 --- a/drivers/mfd/ab8500-core.c +++ b/drivers/mfd/ab8500-core.c @@ -103,8 +103,12 @@ static const int ab8500_irq_regoffset[AB8500_NUM_IRQ_REGS] = { static int ab8500_get_chip_id(struct device *dev) { - struct ab8500 *ab8500 = dev_get_drvdata(dev->parent); - return (int)ab8500->chip_id; + struct ab8500 *ab8500; + + if (!dev) + return -EINVAL; + ab8500 = dev_get_drvdata(dev->parent); + return ab8500 ? (int)ab8500->chip_id : -EINVAL; } static int set_register_interruptible(struct ab8500 *ab8500, u8 bank, |