---

yaml --- r: 310647 b: refs/heads/master c: 7d4be2f h: refs/heads/master i: 310645: 5b50551 310643: b3aa432 310639: e917ca7 v: v3
git-mirror · Jun 4, 2012 · f174393 · f174393
1 parent 4d116df
commit f174393
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)) {