Commit 3f1dc550 authored by Axel Lin's avatar Axel Lin Committed by Greg Kroah-Hartman

extcon: Set platform drvdata in gpio_extcon_probe() and fix irq leak

Add missing platform_set_drvdata() in gpio_extcon_probe(), otherwise calling
platform_get_drvdata in gpio_extcon_remove() returns NULL.

Also add missing free_irq call in gpio_extcon_remove().
Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 155cb06c
...@@ -125,6 +125,7 @@ static int __devinit gpio_extcon_probe(struct platform_device *pdev) ...@@ -125,6 +125,7 @@ static int __devinit gpio_extcon_probe(struct platform_device *pdev)
if (ret < 0) if (ret < 0)
goto err_request_irq; goto err_request_irq;
platform_set_drvdata(pdev, extcon_data);
/* Perform initial detection */ /* Perform initial detection */
gpio_extcon_work(&extcon_data->work.work); gpio_extcon_work(&extcon_data->work.work);
...@@ -146,6 +147,7 @@ static int __devexit gpio_extcon_remove(struct platform_device *pdev) ...@@ -146,6 +147,7 @@ static int __devexit gpio_extcon_remove(struct platform_device *pdev)
struct gpio_extcon_data *extcon_data = platform_get_drvdata(pdev); struct gpio_extcon_data *extcon_data = platform_get_drvdata(pdev);
cancel_delayed_work_sync(&extcon_data->work); cancel_delayed_work_sync(&extcon_data->work);
free_irq(extcon_data->irq, extcon_data);
gpio_free(extcon_data->gpio); gpio_free(extcon_data->gpio);
extcon_dev_unregister(&extcon_data->edev); extcon_dev_unregister(&extcon_data->edev);
devm_kfree(&pdev->dev, extcon_data); devm_kfree(&pdev->dev, extcon_data);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment