diff options
| author | Mark Brown <broonie@kernel.org> | 2017-08-21 21:48:37 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-08-21 21:48:37 +0100 |
| commit | f13db334bf7b68b0086d04ab6a51517ba41123b4 (patch) | |
| tree | 1ce74e775b64e9804aa5bbece3cdc94fd309912b /drivers/media/platform/coda/coda-bit.c | |
| parent | eb59d73cb535ba32df928f210fb9a8529bf465c0 (diff) | |
| parent | b47b91c8504c62f95ddff2876620d68697927bd4 (diff) | |
| download | talos-op-linux-f13db334bf7b68b0086d04ab6a51517ba41123b4.tar.gz talos-op-linux-f13db334bf7b68b0086d04ab6a51517ba41123b4.zip | |
Merge branch 'topic/msm8916' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-const
Diffstat (limited to 'drivers/media/platform/coda/coda-bit.c')
| -rw-r--r-- | drivers/media/platform/coda/coda-bit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c index 25cbf9e5ac5a..bba1eb43b5d8 100644 --- a/drivers/media/platform/coda/coda-bit.c +++ b/drivers/media/platform/coda/coda-bit.c @@ -393,8 +393,8 @@ static int coda_alloc_framebuffers(struct coda_ctx *ctx, int ret; int i; - if (ctx->codec && (ctx->codec->src_fourcc == V4L2_PIX_FMT_H264 || - ctx->codec->dst_fourcc == V4L2_PIX_FMT_H264)) { + if (ctx->codec->src_fourcc == V4L2_PIX_FMT_H264 || + ctx->codec->dst_fourcc == V4L2_PIX_FMT_H264) { width = round_up(q_data->width, 16); height = round_up(q_data->height, 16); } else { @@ -2198,7 +2198,7 @@ static void coda_finish_decode(struct coda_ctx *ctx) ctx->display_idx = display_idx; } -static void coda_error_decode(struct coda_ctx *ctx) +static void coda_decode_timeout(struct coda_ctx *ctx) { struct vb2_v4l2_buffer *dst_buf; @@ -2223,7 +2223,7 @@ const struct coda_context_ops coda_bit_decode_ops = { .start_streaming = coda_start_decoding, .prepare_run = coda_prepare_decode, .finish_run = coda_finish_decode, - .error_run = coda_error_decode, + .run_timeout = coda_decode_timeout, .seq_end_work = coda_seq_end_work, .release = coda_bit_release, }; |
