[PATCH] misc: Fix irq leak in max8997_muic_probe error path

[PATCH] misc: Fix irq leak in max8997_muic_probe error path

[Axel Lin]

Current code does not properly free allocated irqs if request_threaded_irq
returns error, fix it.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 drivers/misc/max8997-muic.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/misc/max8997-muic.c b/drivers/misc/max8997-muic.c
index 74a9448..409b7fc 100644
--- a/drivers/misc/max8997-muic.c
+++ b/drivers/misc/max8997-muic.c
@@ -566,10 +566,6 @@ static int __devinit max8997_muic_probe(struct platform_device *pdev)
 				"failed: irq request (IRQ: %d,"
 				" error :%d)\n",
 				muic_irq->irq, ret);
-
-			for (i = i - 1; i >= 0; i--)
-				free_irq(muic_irq->irq, info);
-
 			goto err_irq;
 		}
 	}
@@ -583,6 +579,8 @@ static int __devinit max8997_muic_probe(struct platform_device *pdev)
 	return ret;
 
 err_irq:
+	while (--i >= 0)
+		free_irq(pdata->irq_base + muic_irqs[i].irq, info);
 	sysfs_remove_group(&pdev->dev.kobj, &max8997_muic_group);
 err_sysfs:
 err_pdata:
-- 
1.7.5.4

Re: [PATCH] misc: Fix irq leak in max8997_muic_probe error path

[함명주]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=euc-kr, Size: 1284 bytes --]

> Current code does not properly free allocated irqs if request_threaded_irq
> returns error, fix it.
> 
> Signed-off-by: Axel Lin <axel.lin@gmail.com>

Thanks for pointing that out.

Acked-by: MyungJoo Ham <myungjoo.ham@samsung.com>

> ---
>  drivers/misc/max8997-muic.c |    6 ++----
>  1 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/misc/max8997-muic.c b/drivers/misc/max8997-muic.c
> index 74a9448..409b7fc 100644
> --- a/drivers/misc/max8997-muic.c
> +++ b/drivers/misc/max8997-muic.c
> @@ -566,10 +566,6 @@ static int __devinit max8997_muic_probe(struct platform_device *pdev)
>  				"failed: irq request (IRQ: %d,"
>  				" error :%d)\n",
>  				muic_irq->irq, ret);
> -
> -			for (i = i - 1; i >= 0; i--)
> -				free_irq(muic_irq->irq, info);
> -
>  			goto err_irq;
>  		}
>  	}
> @@ -583,6 +579,8 @@ static int __devinit max8997_muic_probe(struct platform_device *pdev)
>  	return ret;
>  
>  err_irq:
> +	while (--i >= 0)
> +		free_irq(pdata->irq_base + muic_irqs[i].irq, info);
>  	sysfs_remove_group(&pdev->dev.kobj, &max8997_muic_group);
>  err_sysfs:
>  err_pdata:
> -- 
> 1.7.5.4
ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥