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

Commit fdf425f3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "radio: iris: fill device capabilities in video_device"

parents 35b76428 05555399

drivers/media/radio/radio-iris.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -5365,7 +5365,9 @@ static int iris_vidioc_querycap(struct file *file, void *priv, 
	strlcpy(radio->g_cap.card, DRIVER_CARD, sizeof(radio->g_cap.card));

	strlcpy(radio->g_cap.card, DRIVER_CARD, sizeof(radio->g_cap.card));





	radio->g_cap.capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;

	radio->g_cap.capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;

	capability->capabilities = radio->g_cap.capabilities;

	capability->device_caps = V4L2_CAP_TUNER | V4L2_CAP_RADIO;

	capability->capabilities = capability->device_caps |

					V4L2_CAP_DEVICE_CAPS;

	return 0;

	return 0;

}

}
@@ -5524,6 +5526,7 @@ static int iris_probe(struct platform_device *pdev) 
	  sizeof(iris_viddev_template));

	  sizeof(iris_viddev_template));

	strlcpy(radio->v4l2_dev.name, DRIVER_NAME,

	strlcpy(radio->v4l2_dev.name, DRIVER_NAME,

			sizeof(radio->v4l2_dev.name));

			sizeof(radio->v4l2_dev.name));

	radio->videodev->device_caps = V4L2_CAP_TUNER | V4L2_CAP_RADIO;

	retval = v4l2_device_register(NULL, &radio->v4l2_dev);

	retval = v4l2_device_register(NULL, &radio->v4l2_dev);

	if (retval)

	if (retval)

		return -EINVAL;

		return -EINVAL;