diff options
| author | Philipp Zabel | 2014-07-11 06:36:18 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2014-07-22 11:54:29 -0300 |
| commit | b9736299c427d5b3df7324e4469f9ce46793f943 (patch) | |
| tree | 2ce05b320d5484e31367aa0dbc2891ee376921ff /drivers/media/platform | |
| parent | 8954844195670217f57ed185f003bca287fd8ebd (diff) | |
[media] coda: remove BUG() in get_q_data
This allows us to get rid of the now superfluous v4l2_m2m_get_vq check
in G_FMT. Also, we can use this to check the buffer type in G_SELECTION
later.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform')
| -rw-r--r-- | drivers/media/platform/coda.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c index 667149485d99..f1b16dff89d8 100644 --- a/drivers/media/platform/coda.c +++ b/drivers/media/platform/coda.c @@ -326,9 +326,8 @@ static struct coda_q_data *get_q_data(struct coda_ctx *ctx, case V4L2_BUF_TYPE_VIDEO_CAPTURE: return &(ctx->q_data[V4L2_M2M_DST]); default: - BUG(); + return NULL; } - return NULL; } /* @@ -571,15 +570,12 @@ static int coda_enum_fmt_vid_out(struct file *file, void *priv, static int coda_g_fmt(struct file *file, void *priv, struct v4l2_format *f) { - struct vb2_queue *vq; struct coda_q_data *q_data; struct coda_ctx *ctx = fh_to_ctx(priv); - vq = v4l2_m2m_get_vq(ctx->m2m_ctx, f->type); - if (!vq) - return -EINVAL; - q_data = get_q_data(ctx, f->type); + if (!q_data) + return -EINVAL; f->fmt.pix.field = V4L2_FIELD_NONE; f->fmt.pix.pixelformat = q_data->fourcc; @@ -628,6 +624,8 @@ static int coda_try_fmt(struct coda_ctx *ctx, struct coda_codec *codec, break; default: q_data = get_q_data(ctx, f->type); + if (!q_data) + return -EINVAL; f->fmt.pix.pixelformat = q_data->fourcc; } |