From c6a24bdd5296732b4dd5af68cad5bb5860190922 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Sat, 16 Jun 2012 11:55:18 +0800 Subject: [PATCH] --- yaml --- r: 318203 b: refs/heads/master c: b945f3fa829a7315488f4d39a866dfbb29e8a49a h: refs/heads/master i: 318201: 13d709a23a6a6157e0f19e9ef67b0ed68c6b3c1c 318199: 620cfdca8d3e641d2adc4b514b661dac07bb0b13 v: v3 --- [refs] | 2 +- trunk/drivers/extcon/extcon_gpio.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c310262ec8f9..303cb745205e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e7b4a59b3d7bb2dcd11c019354bf0c91037dadd +refs/heads/master: b945f3fa829a7315488f4d39a866dfbb29e8a49a diff --git a/trunk/drivers/extcon/extcon_gpio.c b/trunk/drivers/extcon/extcon_gpio.c index fe7a07b47336..8a0dcc11c7c7 100644 --- a/trunk/drivers/extcon/extcon_gpio.c +++ b/trunk/drivers/extcon/extcon_gpio.c @@ -125,6 +125,7 @@ static int __devinit gpio_extcon_probe(struct platform_device *pdev) if (ret < 0) goto err_request_irq; + platform_set_drvdata(pdev, extcon_data); /* Perform initial detection */ gpio_extcon_work(&extcon_data->work.work); @@ -146,6 +147,7 @@ static int __devexit gpio_extcon_remove(struct platform_device *pdev) struct gpio_extcon_data *extcon_data = platform_get_drvdata(pdev); cancel_delayed_work_sync(&extcon_data->work); + free_irq(extcon_data->irq, extcon_data); gpio_free(extcon_data->gpio); extcon_dev_unregister(&extcon_data->edev); devm_kfree(&pdev->dev, extcon_data);