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

Commit f1927479 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

[media] pwc: Don't return EINVAL when an unsupported pixelformat is requested 



Instead chaneg the passed in format to the pwc default pixelformat.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 78f968fa

drivers/media/usb/pwc/pwc-v4l.c

+3 −4
Original line number Diff line number Diff line
@@ -434,19 +434,18 @@ static int pwc_vidioc_try_fmt(struct pwc_device *pdev, struct v4l2_format *f) 
		case V4L2_PIX_FMT_PWC1:

			if (DEVICE_USE_CODEC23(pdev->type)) {

				PWC_DEBUG_IOCTL("codec1 is only supported for old pwc webcam\n");

				return -EINVAL;

				f->fmt.pix.pixelformat = V4L2_PIX_FMT_YUV420;

			}

			break;

		case V4L2_PIX_FMT_PWC2:

			if (DEVICE_USE_CODEC1(pdev->type)) {

				PWC_DEBUG_IOCTL("codec23 is only supported for new pwc webcam\n");

				return -EINVAL;

				f->fmt.pix.pixelformat = V4L2_PIX_FMT_YUV420;

			}

			break;

		default:

			PWC_DEBUG_IOCTL("Unsupported pixel format\n");

			return -EINVAL;



			f->fmt.pix.pixelformat = V4L2_PIX_FMT_YUV420;

	}



	size = pwc_get_size(pdev, f->fmt.pix.width, f->fmt.pix.height);