From 6ba523f051dc9d167db83382e21e489d0726eba5 Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Thu, 17 May 2012 14:45:20 +0100
Subject: [PATCH] --- yaml --- r: 308768 b: refs/heads/master c:
 6dff11e5ab2f752ad75d0b506fcc981fef9999c5 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/mfd/ab8500-gpadc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c2258463e280..edb583708f54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a8fea031ed5462b63877e0f6d29e0fc0fb82f14
+refs/heads/master: 6dff11e5ab2f752ad75d0b506fcc981fef9999c5
diff --git a/trunk/drivers/mfd/ab8500-gpadc.c b/trunk/drivers/mfd/ab8500-gpadc.c
index c39fc716e1dc..c1656ab34c34 100644
--- a/trunk/drivers/mfd/ab8500-gpadc.c
+++ b/trunk/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;