Skip to content

Commit

Permalink
[media] s5p-fimc: add unlock on error path
Browse files Browse the repository at this point in the history
There was an unlock missing if kzalloc() failed.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Dan Carpenter authored and Mauro Carvalho Chehab committed Oct 23, 2010
1 parent aa55f3a commit 29adc2c
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions drivers/media/video/s5p-fimc/fimc-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1320,16 +1320,18 @@ static int fimc_m2m_open(struct file *file)
* is already opened.
*/
if (fimc->vid_cap.refcnt > 0) {
mutex_unlock(&fimc->lock);
return -EBUSY;
err = -EBUSY;
goto err_unlock;
}

fimc->m2m.refcnt++;
set_bit(ST_OUTDMA_RUN, &fimc->state);

ctx = kzalloc(sizeof *ctx, GFP_KERNEL);
if (!ctx)
return -ENOMEM;
if (!ctx) {
err = -ENOMEM;
goto err_unlock;
}

file->private_data = ctx;
ctx->fimc_dev = fimc;
Expand All @@ -1349,6 +1351,7 @@ static int fimc_m2m_open(struct file *file)
kfree(ctx);
}

err_unlock:
mutex_unlock(&fimc->lock);
return err;
}
Expand Down

0 comments on commit 29adc2c

Please sign in to comment.