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

Commit c350912c authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files

[media] msi3101: fix v4l2-compliance issues 



Fix msi3101 driver v4l2-compliance issues.

Cc: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 952a70aa

drivers/staging/media/msi3101/sdr-msi3101.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -1134,6 +1134,7 @@ static int msi3101_g_fmt_sdr_cap(struct file *file, void *priv, 
	dev_dbg(&s->udev->dev, "%s: pixelformat fourcc %4.4s\n", __func__,

	dev_dbg(&s->udev->dev, "%s: pixelformat fourcc %4.4s\n", __func__,

			(char *)&s->pixelformat);

			(char *)&s->pixelformat);





	memset(f->fmt.sdr.reserved, 0, sizeof(f->fmt.sdr.reserved));

	f->fmt.sdr.pixelformat = s->pixelformat;

	f->fmt.sdr.pixelformat = s->pixelformat;





	return 0;

	return 0;
@@ -1151,6 +1152,7 @@ static int msi3101_s_fmt_sdr_cap(struct file *file, void *priv, 
	if (vb2_is_busy(q))

	if (vb2_is_busy(q))

		return -EBUSY;

		return -EBUSY;





	memset(f->fmt.sdr.reserved, 0, sizeof(f->fmt.sdr.reserved));

	for (i = 0; i < NUM_FORMATS; i++) {

	for (i = 0; i < NUM_FORMATS; i++) {

		if (formats[i].pixelformat == f->fmt.sdr.pixelformat) {

		if (formats[i].pixelformat == f->fmt.sdr.pixelformat) {

			s->pixelformat = f->fmt.sdr.pixelformat;

			s->pixelformat = f->fmt.sdr.pixelformat;
@@ -1172,6 +1174,7 @@ static int msi3101_try_fmt_sdr_cap(struct file *file, void *priv, 
	dev_dbg(&s->udev->dev, "%s: pixelformat fourcc %4.4s\n", __func__,

	dev_dbg(&s->udev->dev, "%s: pixelformat fourcc %4.4s\n", __func__,

			(char *)&f->fmt.sdr.pixelformat);

			(char *)&f->fmt.sdr.pixelformat);





	memset(f->fmt.sdr.reserved, 0, sizeof(f->fmt.sdr.reserved));

	for (i = 0; i < NUM_FORMATS; i++) {

	for (i = 0; i < NUM_FORMATS; i++) {

		if (formats[i].pixelformat == f->fmt.sdr.pixelformat)

		if (formats[i].pixelformat == f->fmt.sdr.pixelformat)

			return 0;

			return 0;
@@ -1233,6 +1236,7 @@ static int msi3101_g_frequency(struct file *file, void *priv, 
		f->frequency = s->f_adc;

		f->frequency = s->f_adc;

		ret = 0;

		ret = 0;

	} else if (f->tuner == 1) {

	} else if (f->tuner == 1) {

		f->type = V4L2_TUNER_RF;

		ret = v4l2_subdev_call(s->v4l2_subdev, tuner, g_frequency, f);

		ret = v4l2_subdev_call(s->v4l2_subdev, tuner, g_frequency, f);

	} else {

	} else {

		ret = -EINVAL;

		ret = -EINVAL;