iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

extcon: max77693: Fix incorrect error check and return value

Browse Source 
irq_create_mapping() returns 0 if it fails to provide a valid irq number.
'ret' needs to be updated with a negative error code before returning from
probe to signal probe failure. While at it, also corrected the 'virq' type to
unsigned from signed.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Myungjoo Ham <myungjoo.ham@samsung.com>
This commit is contained in:
Sachin Kamat 2012-11-20 15:46:44 +09:00 committed by MyungJoo Ham
parent 68c9274d0f
commit 00af4b16e0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/extcon/extcon-max77693.c
View File

@ -686,11 +686,13 @@ static int __devinit max77693_muic_probe(struct platform_device *pdev)
/* Support irq domain for MAX77693 MUIC device */ /* Support irq domain for MAX77693 MUIC device */
for (i = 0; i < ARRAY_SIZE(muic_irqs); i++) { for (i = 0; i < ARRAY_SIZE(muic_irqs); i++) {
struct max77693_muic_irq *muic_irq = &muic_irqs[i]; struct max77693_muic_irq *muic_irq = &muic_irqs[i];
int virq = 0; unsigned int virq = 0;
virq = irq_create_mapping(max77693->irq_domain, muic_irq->irq); virq = irq_create_mapping(max77693->irq_domain, muic_irq->irq);
if (!virq) if (!virq) {
ret = -EINVAL;
goto err_irq; goto err_irq;
}
muic_irq->virq = virq; muic_irq->virq = virq;
ret = request_threaded_irq(virq, NULL, ret = request_threaded_irq(virq, NULL,
@ -702,8 +704,6 @@ static int __devinit max77693_muic_probe(struct platform_device *pdev)
" error :%d)\n", " error :%d)\n",
muic_irq->irq, ret); muic_irq->irq, ret);
for (i = i - 1; i >= 0; i--)
free_irq(muic_irq->virq, info);
goto err_irq; goto err_irq;
} }
} }
@ -768,6 +768,8 @@ static int __devinit max77693_muic_probe(struct platform_device *pdev)
err_extcon: err_extcon:
kfree(info->edev); kfree(info->edev);
err_irq: err_irq:
while (--i >= 0)
free_irq(muic_irqs[i].virq, info);
err_regmap: err_regmap:
kfree(info); kfree(info);
err_kfree: err_kfree: