Commit a020c747 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] media/platform: fix querycap 



Querycap shouldn't set the version field (the core does that for you),
but it should set the device_caps field.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Cc: Scott Jiang <scott.jiang.linux@gmail.com>
Cc: Gerhard Sittig <gsi@denx.de>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 7027c448

drivers/media/platform/blackfin/bfin_capture.c

+2 −1
Original line number Diff line number Diff line
@@ -841,7 +841,8 @@ static int bcap_querycap(struct file *file, void *priv, 
{

	struct bcap_device *bcap_dev = video_drvdata(file);



	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;

	strlcpy(cap->driver, CAPTURE_DRV_NAME, sizeof(cap->driver));

	strlcpy(cap->bus_info, "Blackfin Platform", sizeof(cap->bus_info));

	strlcpy(cap->card, bcap_dev->cfg->card_name, sizeof(cap->card));

drivers/media/platform/fsl-viu.c

+2 −1
Original line number Diff line number Diff line
@@ -604,10 +604,11 @@ static int vidioc_querycap(struct file *file, void *priv, 
{

	strcpy(cap->driver, "viu");

	strcpy(cap->card, "viu");

	cap->capabilities =	V4L2_CAP_VIDEO_CAPTURE |

	cap->device_caps =	V4L2_CAP_VIDEO_CAPTURE |

				V4L2_CAP_STREAMING     |

				V4L2_CAP_VIDEO_OVERLAY |

				V4L2_CAP_READWRITE;

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

	return 0;

}

drivers/media/platform/marvell-ccic/mcam-core.c

+2 −2
Original line number Diff line number Diff line
@@ -1408,9 +1408,9 @@ static int mcam_vidioc_querycap(struct file *file, void *priv, 
{

	strcpy(cap->driver, "marvell_ccic");

	strcpy(cap->card, "marvell_ccic");

	cap->version = 1;

	cap->capabilities = V4L2_CAP_VIDEO_CAPTURE |

	cap->device_caps = V4L2_CAP_VIDEO_CAPTURE |

		V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;

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

	return 0;

}

drivers/media/platform/mx2_emmaprp.c

+2 −7
Original line number Diff line number Diff line
@@ -402,13 +402,8 @@ static int vidioc_querycap(struct file *file, void *priv, 
{

	strncpy(cap->driver, MEM2MEM_NAME, sizeof(cap->driver) - 1);

	strncpy(cap->card, MEM2MEM_NAME, sizeof(cap->card) - 1);

	/*

	 * This is only a mem-to-mem video device. The capture and output

	 * device capability flags are left only for backward compatibility

	 * and are scheduled for removal.

	 */

	cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT |

			    V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING;

	cap->device_caps = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING;

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

	return 0;

}

drivers/media/platform/omap/omap_vout.c

+2 −1
Original line number Diff line number Diff line
@@ -1054,8 +1054,9 @@ static int vidioc_querycap(struct file *file, void *fh, 
	strlcpy(cap->driver, VOUT_NAME, sizeof(cap->driver));

	strlcpy(cap->card, vout->vfd->name, sizeof(cap->card));

	cap->bus_info[0] = '\0';

	cap->capabilities = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT |

	cap->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT |

		V4L2_CAP_VIDEO_OUTPUT_OVERLAY;

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



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE