diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2012-11-20 10:46:44 +0400 |
|---|---|---|
| committer | MyungJoo Ham <myungjoo.ham@samsung.com> | 2012-11-21 15:00:40 +0400 |
| commit | 00af4b16e098f7899d78c7009f0b525c9c512f94 (patch) | |
| tree | a73ea5686d6008c8e99d80027019f520f6c82069 | |
| parent | 68c9274d0fd1f66c6d105c52a61268d943e30862 (diff) | |
| download | linux-00af4b16e098f7899d78c7009f0b525c9c512f94.tar.xz | |
extcon: max77693: Fix incorrect error check and return value
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>
| -rw-r--r-- | drivers/extcon/extcon-max77693.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c index a17d0d91ada2..2a0f397885fd 100644 --- a/drivers/extcon/extcon-max77693.c +++ b/drivers/extcon/extcon-max77693.c @@ -686,11 +686,13 @@ static int __devinit max77693_muic_probe(struct platform_device *pdev) /* Support irq domain for MAX77693 MUIC device */ for (i = 0; i < ARRAY_SIZE(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); - if (!virq) + if (!virq) { + ret = -EINVAL; goto err_irq; + } muic_irq->virq = virq; ret = request_threaded_irq(virq, NULL, @@ -702,8 +704,6 @@ static int __devinit max77693_muic_probe(struct platform_device *pdev) " error :%d)\n", muic_irq->irq, ret); - for (i = i - 1; i >= 0; i--) - free_irq(muic_irq->virq, info); goto err_irq; } } @@ -768,6 +768,8 @@ static int __devinit max77693_muic_probe(struct platform_device *pdev) err_extcon: kfree(info->edev); err_irq: + while (--i >= 0) + free_irq(muic_irqs[i].virq, info); err_regmap: kfree(info); err_kfree: |