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)) {