Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9736299 authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarKamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 89548441

drivers/media/platform/coda.c

+5 −7
Original line number Diff line number Diff line
@@ -326,10 +326,9 @@ 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;

	}

}



/*

 * Array of all formats supported by any version of Coda:
@@ -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;

	}