From 4dbed42f00ce2668d1dbe136045de7bb4ab203d8 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 21 Jan 2012 14:47:00 +0000
Subject: [PATCH] --- yaml --- r: 296370 b: refs/heads/master c:
 7655b2ac9ed3206fb916357b8b1065f08324507d h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/mfd/ucb1x00-core.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 06fc7eb3a317..e505d4d60420 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5ae587f5d258bda9c24bb8387315eb2ebedeee9
+refs/heads/master: 7655b2ac9ed3206fb916357b8b1065f08324507d
diff --git a/trunk/drivers/mfd/ucb1x00-core.c b/trunk/drivers/mfd/ucb1x00-core.c
index 74d9fcf891d5..30ef726f4ba0 100644
--- a/trunk/drivers/mfd/ucb1x00-core.c
+++ b/trunk/drivers/mfd/ucb1x00-core.c
@@ -579,6 +579,8 @@ static int ucb1x00_probe(struct mcp *mcp)
 	ucb->gpio.base = -1;
 	if (pdata && pdata->gpio_base) {
 		ucb->gpio.label = dev_name(&ucb->dev);
+		ucb->gpio.dev = &ucb->dev;
+		ucb->gpio.owner = THIS_MODULE;
 		ucb->gpio.base = pdata->gpio_base;
 		ucb->gpio.ngpio = 10;
 		ucb->gpio.set = ucb1x00_gpio_set;