From f174393c54a0b16551c79130aa79e7184d5992f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Heiko=20St=C3=BCbner?= <heiko@sntech.de>
Date: Sun, 3 Jun 2012 21:30:33 +0200
Subject: [PATCH] --- yaml --- r: 310647 b: refs/heads/master c:
 7d4be2f5ad223942577c2319153b86592f3da5b2 h: refs/heads/master i:   310645:
 5b505518e0d77f384fd4c15ff784dd976e4f3bbe   310643:
 b3aa4321d2d822e7f3077c2d797369ba533cbd4a   310639:
 e917ca779fad7e1c3a2d4c1f0992596fc68acf47 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/regulator/gpio-regulator.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c16e1e5ef461..a8153d717f43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c09d3150902d8ca7e763d508ac1a93701b21321
+refs/heads/master: 7d4be2f5ad223942577c2319153b86592f3da5b2
diff --git a/trunk/drivers/regulator/gpio-regulator.c b/trunk/drivers/regulator/gpio-regulator.c
index 9997d7aaca84..ebe2b5c2e2df 100644
--- a/trunk/drivers/regulator/gpio-regulator.c
+++ b/trunk/drivers/regulator/gpio-regulator.c
@@ -286,7 +286,7 @@ static int __devinit gpio_regulator_probe(struct platform_device *pdev)
 
 	cfg.dev = &pdev->dev;
 	cfg.init_data = config->init_data;
-	cfg.driver_data = &drvdata;
+	cfg.driver_data = drvdata;
 
 	drvdata->dev = regulator_register(&drvdata->desc, &cfg);
 	if (IS_ERR(drvdata->dev)) {