diff options
Diffstat (limited to 'drivers/media/rc/ite-cir.c')
-rw-r--r-- | drivers/media/rc/ite-cir.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c index 0e49c99abf6..36fe5a349b9 100644 --- a/drivers/media/rc/ite-cir.c +++ b/drivers/media/rc/ite-cir.c | |||
@@ -1598,24 +1598,22 @@ static int ite_probe(struct pnp_dev *pdev, const struct pnp_device_id | |||
1598 | 1598 | ||
1599 | if (request_irq(itdev->cir_irq, ite_cir_isr, IRQF_SHARED, | 1599 | if (request_irq(itdev->cir_irq, ite_cir_isr, IRQF_SHARED, |
1600 | ITE_DRIVER_NAME, (void *)itdev)) | 1600 | ITE_DRIVER_NAME, (void *)itdev)) |
1601 | goto failure; | 1601 | goto failure2; |
1602 | 1602 | ||
1603 | ret = rc_register_device(rdev); | 1603 | ret = rc_register_device(rdev); |
1604 | if (ret) | 1604 | if (ret) |
1605 | goto failure; | 1605 | goto failure3; |
1606 | 1606 | ||
1607 | itdev->rdev = rdev; | 1607 | itdev->rdev = rdev; |
1608 | ite_pr(KERN_NOTICE, "driver has been successfully loaded\n"); | 1608 | ite_pr(KERN_NOTICE, "driver has been successfully loaded\n"); |
1609 | 1609 | ||
1610 | return 0; | 1610 | return 0; |
1611 | 1611 | ||
1612 | failure3: | ||
1613 | free_irq(itdev->cir_irq, itdev); | ||
1614 | failure2: | ||
1615 | release_region(itdev->cir_addr, itdev->params.io_region_size); | ||
1612 | failure: | 1616 | failure: |
1613 | if (itdev->cir_irq) | ||
1614 | free_irq(itdev->cir_irq, itdev); | ||
1615 | |||
1616 | if (itdev->cir_addr) | ||
1617 | release_region(itdev->cir_addr, itdev->params.io_region_size); | ||
1618 | |||
1619 | rc_free_device(rdev); | 1617 | rc_free_device(rdev); |
1620 | kfree(itdev); | 1618 | kfree(itdev); |
1621 | 1619 | ||