From c1a7540e80ad5970fc198c2afc72ead7fdaa1378 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Fri, 11 Jan 2013 08:51:13 +0900 Subject: [PATCH] --- yaml --- r: 354953 b: refs/heads/master c: 3d44ea1cfbf671152d3ac0ede94439550afa7406 h: refs/heads/master i: 354951: 094ce9019e8517b1d837d37daed6f4e5f4bd374b v: v3 --- [refs] | 2 +- trunk/drivers/extcon/extcon-arizona.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0a106a2646c6..28868079bdf1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a162629859a03c07b9603ea59a0b7ae24f695689 +refs/heads/master: 3d44ea1cfbf671152d3ac0ede94439550afa7406 diff --git a/trunk/drivers/extcon/extcon-arizona.c b/trunk/drivers/extcon/extcon-arizona.c index 414aed50b1bc..4454d2df3a58 100644 --- a/trunk/drivers/extcon/extcon-arizona.c +++ b/trunk/drivers/extcon/extcon-arizona.c @@ -418,7 +418,7 @@ static int arizona_extcon_probe(struct platform_device *pdev) arizona_extcon_set_mode(info, 0); - info->input = input_allocate_device(); + info->input = devm_input_allocate_device(&pdev->dev); if (!info->input) { dev_err(arizona->dev, "Can't allocate input dev\n"); ret = -ENOMEM; @@ -510,7 +510,6 @@ static int arizona_extcon_probe(struct platform_device *pdev) err_rise: arizona_free_irq(arizona, ARIZONA_IRQ_JD_RISE, info); err_input: - input_free_device(info->input); err_register: pm_runtime_disable(&pdev->dev); extcon_dev_unregister(&info->edev); @@ -533,7 +532,6 @@ static int arizona_extcon_remove(struct platform_device *pdev) regmap_update_bits(arizona->regmap, ARIZONA_JACK_DETECT_ANALOGUE, ARIZONA_JD1_ENA, 0); arizona_clk32k_disable(arizona); - input_unregister_device(info->input); extcon_dev_unregister(&info->edev); return 0;