From 227565bd308ff57fd3bb7869fca6af7e9fd735c2 Mon Sep 17 00:00:00 2001 From: Chanwoo Choi Date: Wed, 13 Feb 2013 18:35:05 +0900 Subject: [PATCH] --- yaml --- r: 355083 b: refs/heads/master c: eff7d74f5b88ef31ac47c6d96b1494db199705f5 h: refs/heads/master i: 355081: dedb6ae0a978374696a791dcf17345ae73c18f22 355079: bbcb9f6ab26a6ebe995200b2a186ba1f75374512 v: v3 --- [refs] | 2 +- trunk/drivers/extcon/extcon-max77693.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e82150ae2bdb..f71d585e8d93 100644 --- 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 index fb6527607a11..597f33c1f868 100644 --- 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;