---

yaml --- r: 355083 b: refs/heads/master c: eff7d74 h: refs/heads/master i: 355081: dedb6ae 355079: bbcb9f6 v: v3
git-mirror · Feb 13, 2013 · 227565b · 227565b
1 parent 8112525
commit 227565b
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: fd116066d966549211b41d929feea5474d57461b
+refs/heads/master: eff7d74f5b88ef31ac47c6d96b1494db199705f5
diff --git a/trunk/drivers/extcon/extcon-max77693.c b/trunk/drivers/extcon/extcon-max77693.c
@@ -1066,7 +1066,7 @@ static int max77693_muic_probe(struct platform_device *pdev)
 	}
 
 	/* Register input device for button of dock device */
-	info->dock = input_allocate_device();
+	info->dock = devm_input_allocate_device(&pdev->dev);
 	if (!info->dock) {
 		dev_err(&pdev->dev, "%s: failed to allocate input\n", __func__);
 		return -ENOMEM;