From 8fc827150cfe3e4cfd3afe08e5985dea9bd8f634 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Sat, 16 Jun 2012 11:55:18 +0800 Subject: [PATCH] --- yaml --- r: 311147 b: refs/heads/master c: 3f1dc550b069e9fbfe375844f3c76f2cdd12f05c h: refs/heads/master i: 311145: 44dc252f3df82a4ef8605a39e3f60736ee1eb56f 311143: 089037905421f466c0344effe9bff1be100c0f94 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 e0b0f01e7233..9a1f85c5aae9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 155cb06c89f13af3e3e6bd520b9c62762f532d7b +refs/heads/master: 3f1dc550b069e9fbfe375844f3c76f2cdd12f05c 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);