diff mbox

[-next] Input: pmic8xxx-pwrkey - fix to pass correct device identity to free_irq()

Message ID CAPgLHd87FxZ6ur_WLC9Q9bjOfNbOTu6yzNWNcN-ar0=o1y48Kg@mail.gmail.com
State New, archived
Headers show

Commit Message

Wei Yongjun Dec. 17, 2013, 1:16 a.m. UTC
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

free_irq() in the error handling case is missing when change
pass input device directly to interrupt.

Fixes: b27f8fee4965('Input: pmic8xxx-pwrkey - pass input device directly to interrupt')
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
 drivers/input/misc/pmic8xxx-pwrkey.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Stephen Boyd Dec. 17, 2013, 1:23 a.m. UTC | #1
On 12/17, Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> 
> free_irq() in the error handling case is missing when change
> pass input device directly to interrupt.
> 
> Fixes: b27f8fee4965('Input: pmic8xxx-pwrkey - pass input device directly to interrupt')
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

This driver was supposed to be converted to devm before
that patch. I forgot to send it and then Dmitry seems to have
fixed up the patch to make it apply. We should just use the devm
conversion patch to avoid needing to apply this one.
dmitry.torokhov@gmail.com Dec. 17, 2013, 4:48 p.m. UTC | #2
On Mon, Dec 16, 2013 at 05:23:58PM -0800, Stephen Boyd wrote:
> On 12/17, Wei Yongjun wrote:
> > From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> > 
> > free_irq() in the error handling case is missing when change
> > pass input device directly to interrupt.
> > 
> > Fixes: b27f8fee4965('Input: pmic8xxx-pwrkey - pass input device directly to interrupt')
> > Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> 
> This driver was supposed to be converted to devm before
> that patch. I forgot to send it and then Dmitry seems to have
> fixed up the patch to make it apply. We should just use the devm
> conversion patch to avoid needing to apply this one.

I am still going to apply it, but if you could take a look at my devm
conversion patch for the driver that would be great.

Thanks.
diff mbox

Patch

diff --git a/drivers/input/misc/pmic8xxx-pwrkey.c b/drivers/input/misc/pmic8xxx-pwrkey.c
index ef93840..3914e5b 100644
--- a/drivers/input/misc/pmic8xxx-pwrkey.c
+++ b/drivers/input/misc/pmic8xxx-pwrkey.c
@@ -182,7 +182,7 @@  static int pmic8xxx_pwrkey_probe(struct platform_device *pdev)
 	return 0;
 
 free_press_irq:
-	free_irq(key_press_irq, pwrkey);
+	free_irq(key_press_irq, pwr);
 unreg_input_dev:
 	input_unregister_device(pwr);
 	pwr = NULL;