diff options
Diffstat (limited to 'drivers/media/video/exynos/fimc-lite/fimc-lite-core.c')
| -rw-r--r-- | drivers/media/video/exynos/fimc-lite/fimc-lite-core.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/media/video/exynos/fimc-lite/fimc-lite-core.c b/drivers/media/video/exynos/fimc-lite/fimc-lite-core.c index eddbf1d..011787c 100644 --- a/drivers/media/video/exynos/fimc-lite/fimc-lite-core.c +++ b/drivers/media/video/exynos/fimc-lite/fimc-lite-core.c @@ -2021,7 +2021,7 @@ static int flite_probe(struct platform_device *pdev) pdev->name); if (!regs_res) { dev_err(&pdev->dev, "Failed to request io memory region\n"); - goto err_resource; + goto err_flite; } flite->regs_res = regs_res; @@ -2044,8 +2044,10 @@ static int flite_probe(struct platform_device *pdev) } sd = kzalloc(sizeof(*sd), GFP_KERNEL); - if (!sd) - goto err_irq; + if (!sd) { + ret = -ENOMEM; + goto err_irq; + } v4l2_subdev_init(sd, &flite_subdev_ops); snprintf(sd->name, sizeof(sd->name), "flite-subdev.%d", flite->id); @@ -2062,13 +2064,13 @@ static int flite_probe(struct platform_device *pdev) mutex_init(&flite->lock); flite->mdev = flite_get_capture_md(MDEV_CAPTURE); if (IS_ERR_OR_NULL(flite->mdev)) - goto err_irq; + goto err_device_register; flite_dbg("mdev = 0x%08x", (u32)flite->mdev); ret = flite_register_video_device(flite); if (ret) - goto err_irq; + goto err_device_register; /* Get mipi-csis subdev ptr using mdev */ flite->sd_csis = flite->mdev->csis_sd[flite->id]; @@ -2130,6 +2132,8 @@ err_vfd_alloc: media_entity_cleanup(&flite->vfd->entity); video_device_release(flite->vfd); #endif +err_device_register: + kfree(sd); err_irq: free_irq(flite->irq, flite); err_reg_unmap: |