aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/s5p-mfc/s5p_mfc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/platform/s5p-mfc/s5p_mfc.c')
-rw-r--r--drivers/media/platform/s5p-mfc/s5p_mfc.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index 8333fbc2fe96..8de61dc1e142 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -211,6 +211,7 @@ static void s5p_mfc_handle_frame_all_extracted(struct s5p_mfc_ctx *ctx)
211 dst_buf->b->v4l2_buf.field = V4L2_FIELD_NONE; 211 dst_buf->b->v4l2_buf.field = V4L2_FIELD_NONE;
212 else 212 else
213 dst_buf->b->v4l2_buf.field = V4L2_FIELD_INTERLACED; 213 dst_buf->b->v4l2_buf.field = V4L2_FIELD_INTERLACED;
214 dst_buf->b->v4l2_buf.flags |= V4L2_BUF_FLAG_LAST;
214 215
215 ctx->dec_dst_flag &= ~(1 << dst_buf->b->v4l2_buf.index); 216 ctx->dec_dst_flag &= ~(1 << dst_buf->b->v4l2_buf.index);
216 vb2_buffer_done(dst_buf->b, VB2_BUF_STATE_DONE); 217 vb2_buffer_done(dst_buf->b, VB2_BUF_STATE_DONE);
@@ -1337,8 +1338,6 @@ static int s5p_mfc_runtime_resume(struct device *dev)
1337 struct platform_device *pdev = to_platform_device(dev); 1338 struct platform_device *pdev = to_platform_device(dev);
1338 struct s5p_mfc_dev *m_dev = platform_get_drvdata(pdev); 1339 struct s5p_mfc_dev *m_dev = platform_get_drvdata(pdev);
1339 1340
1340 if (!m_dev->alloc_ctx)
1341 return 0;
1342 atomic_set(&m_dev->pm.power, 1); 1341 atomic_set(&m_dev->pm.power, 1);
1343 return 0; 1342 return 0;
1344} 1343}
@@ -1463,7 +1462,7 @@ static struct s5p_mfc_variant mfc_drvdata_v8 = {
1463 .fw_name[0] = "s5p-mfc-v8.fw", 1462 .fw_name[0] = "s5p-mfc-v8.fw",
1464}; 1463};
1465 1464
1466static struct platform_device_id mfc_driver_ids[] = { 1465static const struct platform_device_id mfc_driver_ids[] = {
1467 { 1466 {
1468 .name = "s5p-mfc", 1467 .name = "s5p-mfc",
1469 .driver_data = (unsigned long)&mfc_drvdata_v5, 1468 .driver_data = (unsigned long)&mfc_drvdata_v5,