Commit fae46cb0 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: atomisp: fix enum formats logic 



Changeset 374d62e7 ("media: v4l2-subdev: Verify v4l2_subdev_call() pad config argument")
added an extra verification for a pads parameter for enum mbus
format code.

Such change broke atomisp, because now the V4L2 core
refuses to enum MBUS formats if the state is empty.

So, add .which field in order to select the active formats,
in order to make it work again.

While here, improve error messages.

Fixes: 374d62e7 ("media: v4l2-subdev: Verify v4l2_subdev_call() pad config argument")
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent c10bcb13

drivers/staging/media/atomisp/pci/atomisp_ioctl.c

+17 −6
Original line number Diff line number Diff line
@@ -773,7 +773,10 @@ static int atomisp_enum_fmt_cap(struct file *file, void *fh, 
	struct video_device *vdev = video_devdata(file);

	struct atomisp_device *isp = video_get_drvdata(vdev);

	struct atomisp_sub_device *asd = atomisp_to_video_pipe(vdev)->asd;

	struct v4l2_subdev_mbus_code_enum code = { 0 };

	struct v4l2_subdev_mbus_code_enum code = {

		.which = V4L2_SUBDEV_FORMAT_ACTIVE,

	};

	struct v4l2_subdev *camera;

	unsigned int i, fi = 0;

	int rval;
@@ -783,14 +786,20 @@ static int atomisp_enum_fmt_cap(struct file *file, void *fh, 
		return -EINVAL;

	}



	camera = isp->inputs[asd->input_curr].camera;

	if(!camera) {

		dev_err(isp->dev, "%s(): camera is NULL, device is %s\n",

			__func__, vdev->name);

		return -EINVAL;

	}



	rt_mutex_lock(&isp->mutex);

	rval = v4l2_subdev_call(isp->inputs[asd->input_curr].camera, pad,

				enum_mbus_code, NULL, &code);



	rval = v4l2_subdev_call(camera, pad, enum_mbus_code, NULL, &code);

	if (rval == -ENOIOCTLCMD) {

		dev_warn(isp->dev,

			 "enum_mbus_code pad op not supported. Please fix your sensor driver!\n");

		//	rval = v4l2_subdev_call(isp->inputs[asd->input_curr].camera,

		//				video, enum_mbus_fmt, 0, &code.code);

			 "enum_mbus_code pad op not supported by %s. Please fix your sensor driver!\n",

			 camera->name);

	}

	rt_mutex_unlock(&isp->mutex);
@@ -820,6 +829,8 @@ static int atomisp_enum_fmt_cap(struct file *file, void *fh, 
		f->pixelformat = format->pixelformat;

		return 0;

	}

	dev_err(isp->dev, "%s(): format for code %x not found.\n",

		__func__, code.code);



	return -EINVAL;

}