Skip to contentSkip to conversation

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

PATCH 함명주 3 participants 3 messages Jun 19, 2012

lore
Share & tools
lore

함명주

author Acked-by
#0 lore raw
Quoted 6 lines

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().

Thanks!

I'll apply this patch to the extcon-for-next.
I would appear in http://git.infradead.org/users/kmpark/linux-samsung/shortlog/refs/heads/extcon-for-next soon after syncing servers.

Cheers!
MyungJoo

Quoted 27 lines
---
 drivers/extcon/extcon_gpio.c |    2 ++
 1 file changed, 2 insertions(+)
drivers/extcon/extcon_gpio.c +2 -0
index fe7a07b..8a0dcc1 100644
@@ -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);
Signature · 1 line
1.7.9.5

�淸�{.n�+돴윯돪�+%듚�깁負쪐w��{.n�+돴쪐{깸G쳺��{ay����,j�f"톒쉹��묎�z_溫(�쉸듶줷"얎�m����G쳺�◀?솳鈺�&x�~뤳턨O뺞촾퇉v�^�m��� �띠�◀?뻀�

#1 lore raw

2012/6/19 함명주 <[email protected]>:

Quoted 7 lines
Quoted 6 lines

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().

Quoted 7 lines

Thanks!

I'll apply this patch to the extcon-for-next.
I would appear in http://git.infradead.org/users/kmpark/linux-samsung/shortlog/refs/heads/extcon-for-next soon after syncing servers.

Hi MyungJoo,
These patches are already in today's linux-next tree. It's already picked up by Greg.

Regards,
Axel

#2 lore raw
In reply to 함명주
Quoted 7 lines · 함명주
Quoted 6 lines

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().

Quoted 7 lines

Thanks!

I'll apply this patch to the extcon-for-next.
I would appear in http://git.infradead.org/users/kmpark/linux-samsung/shortlog/refs/heads/extcon-for-next soon after syncing servers.

Does this mean you are going to have a separate extcon git tree somewhere, feeding into linux-next, and sending stuff directly to Linus?

I don't see an entry in the MAINTAINERS file saying this, which is why I was picking up extcon patches, should I not be doing this?

confused,

greg k-h