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

Commit 7d96c3e4 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mauro Carvalho Chehab
Browse files

[media] soc-camera: fix device capabilities in multiple camera host drivers 



The V4L2 API requires both .capabilities and .device_caps fields of
struct v4l2_capability to be set. Otherwise the compliance checker
complains and since commit "v4l2-ioctl: WARN_ON if querycap didn't fill
device_caps" a compile-time warning is issued. Fix this non-compliance
in several soc-camera camera host drivers.

Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Tested-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent d0bb12c9

drivers/media/platform/soc_camera/atmel-isi.c

+3 −2
Original line number Diff line number Diff line
@@ -760,8 +760,9 @@ static int isi_camera_querycap(struct soc_camera_host *ici, 
{

	strcpy(cap->driver, "atmel-isi");

	strcpy(cap->card, "Atmel Image Sensor Interface");

	cap->capabilities = (V4L2_CAP_VIDEO_CAPTURE |

				V4L2_CAP_STREAMING);

	cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;

	cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;



	return 0;

}

drivers/media/platform/soc_camera/mx2_camera.c

+2 −1
Original line number Diff line number Diff line
@@ -1256,7 +1256,8 @@ static int mx2_camera_querycap(struct soc_camera_host *ici, 
{

	/* cap->name is set by the friendly caller:-> */

	strlcpy(cap->card, MX2_CAM_DRIVER_DESCRIPTION, sizeof(cap->card));

	cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;

	cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;

	cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;



	return 0;

}

drivers/media/platform/soc_camera/mx3_camera.c

+2 −1
Original line number Diff line number Diff line
@@ -967,7 +967,8 @@ static int mx3_camera_querycap(struct soc_camera_host *ici, 
{

	/* cap->name is set by the firendly caller:-> */

	strlcpy(cap->card, "i.MX3x Camera", sizeof(cap->card));

	cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;

	cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;

	cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;



	return 0;

}

drivers/media/platform/soc_camera/omap1_camera.c

+2 −1
Original line number Diff line number Diff line
@@ -1427,7 +1427,8 @@ static int omap1_cam_querycap(struct soc_camera_host *ici, 
{

	/* cap->name is set by the friendly caller:-> */

	strlcpy(cap->card, "OMAP1 Camera", sizeof(cap->card));

	cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;

	cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;

	cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;



	return 0;

}

drivers/media/platform/soc_camera/pxa_camera.c

+2 −1
Original line number Diff line number Diff line
@@ -1576,7 +1576,8 @@ static int pxa_camera_querycap(struct soc_camera_host *ici, 
{

	/* cap->name is set by the firendly caller:-> */

	strlcpy(cap->card, pxa_cam_driver_description, sizeof(cap->card));

	cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;

	cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;

	cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;



	return 0;

}