summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpanpan liu <panpan1.liu@samsung.com>2014-08-01 16:58:23 +0800
committerChanho Park <chanho61.park@samsung.com>2014-08-07 15:18:00 +0900
commit0061e87dbd33a176afd0d8408749dde6ad598dd4 (patch)
tree254ba55f0f3961719be9d5f8c877695449df3fcd
parent1d516b14c32421b6ed26e201f3eee20c9f4cae20 (diff)
downloadlinux-3.10-0061e87dbd33a176afd0d8408749dde6ad598dd4.tar.gz
linux-3.10-0061e87dbd33a176afd0d8408749dde6ad598dd4.tar.bz2
linux-3.10-0061e87dbd33a176afd0d8408749dde6ad598dd4.zip
media: s5p_mfc_dec: delete the redundant code
Because the api s5p_mfc_queue_setup has already realized the same function Change-Id: Ieffc9cd9d7e22d95f988ec66f232951c6f4c646c Signed-off-by: panpan liu <panpan1.liu@samsung.com>
-rwxr-xr-xdrivers/media/platform/s5p-mfc/s5p_mfc_dec.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
index ff9841029a9..223064a3d0a 100755
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
@@ -544,14 +544,7 @@ static int vidioc_reqbufs(struct file *file, void *priv,
mfc_err("vb2_reqbufs on capture failed\n");
return ret;
}
- if (reqbufs->count < ctx->pb_count) {
- mfc_err("Not enough buffers allocated\n");
- reqbufs->count = 0;
- s5p_mfc_clock_on();
- ret = vb2_reqbufs(&ctx->vq_dst, reqbufs);
- s5p_mfc_clock_off();
- return -ENOMEM;
- }
+
ctx->total_dpb_count = reqbufs->count;
ret = s5p_mfc_hw_call(dev->mfc_ops, alloc_codec_buffers, ctx);
if (ret) {