From 4c7344f863ca64af389d82d49b126d44d37e64cf Mon Sep 17 00:00:00 2001 From: Mattias Wallin Date: Thu, 2 Dec 2010 15:08:32 +0100 Subject: [PATCH] --- yaml --- r: 230995 b: refs/heads/master c: 6bce7bf1a1f8a79a57ff69910c115e1d2ed8913d h: refs/heads/master i: 230993: bd8702f5742436422ea7645ebd37a19c2ba174a7 230991: 09c0c967acde896469d4579acc2604907a9a6e51 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/ab8500-core.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b96bdb2cd8cc..39e5984d04a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec9d0cf578007fa3f86fa34d77d9ccba82f03b29 +refs/heads/master: 6bce7bf1a1f8a79a57ff69910c115e1d2ed8913d diff --git a/trunk/drivers/mfd/ab8500-core.c b/trunk/drivers/mfd/ab8500-core.c index d9640a623ff4..e91b5b759004 100644 --- a/trunk/drivers/mfd/ab8500-core.c +++ b/trunk/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,