summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2012-05-17 15:45:20 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2012-05-20 17:27:11 +0200
commit6dff11e5ab2f752ad75d0b506fcc981fef9999c5 (patch)
tree61d8891cb61143a8b99399cacb724e2d5cb86ae7 /drivers/mfd
parentmfd: Enable ab8500-debug when Device Tree is enabled (diff)
downloadlinux-6dff11e5ab2f752ad75d0b506fcc981fef9999c5.tar.xz
linux-6dff11e5ab2f752ad75d0b506fcc981fef9999c5.zip
mfd: Prevent unassigned pointer from being used in ab8500-gpadc driver
Before this patch if probe failed to find the platform IRQ it would attempt to print a message out using dev_err, which in turn was being passed an unassigned pointer. This patch ensures the information passed to dev_err is correct. Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/ab8500-gpadc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/ab8500-gpadc.c b/drivers/mfd/ab8500-gpadc.c
index c39fc716e1dc..c1656ab34c34 100644
--- a/drivers/mfd/ab8500-gpadc.c
+++ b/drivers/mfd/ab8500-gpadc.c
@@ -584,7 +584,7 @@ static int __devinit ab8500_gpadc_probe(struct platform_device *pdev)
gpadc->irq = platform_get_irq_byname(pdev, "SW_CONV_END");
if (gpadc->irq < 0) {
- dev_err(gpadc->dev, "failed to get platform irq-%d\n",
+ dev_err(&pdev->dev, "failed to get platform irq-%d\n",
gpadc->irq);
ret = gpadc->irq;
goto fail;