update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/platform/vsp1/vsp1_histo.c
..
..
@@ -426,11 +426,9 @@
426
426
 			  | V4L2_CAP_VIDEO_CAPTURE_MPLANE
427
427
 			  | V4L2_CAP_VIDEO_OUTPUT_MPLANE
428
428
 			  | V4L2_CAP_META_CAPTURE;
429
-	cap->device_caps = V4L2_CAP_META_CAPTURE
430
-			 | V4L2_CAP_STREAMING;
431
429
 
432
-	strlcpy(cap->driver, "vsp1", sizeof(cap->driver));
433
-	strlcpy(cap->card, histo->video.name, sizeof(cap->card));
430
+	strscpy(cap->driver, "vsp1", sizeof(cap->driver));
431
+	strscpy(cap->card, histo->video.name, sizeof(cap->card));
434
432
 	snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%s",
435
433
 		 dev_name(histo->entity.vsp1->dev));
436
434
 
..
..
@@ -553,9 +551,10 @@
553
551
 	histo->video.fops = &histo_v4l2_fops;
554
552
 	snprintf(histo->video.name, sizeof(histo->video.name),
555
553
 		 "%s histo", histo->entity.subdev.name);
556
-	histo->video.vfl_type = VFL_TYPE_GRABBER;
554
+	histo->video.vfl_type = VFL_TYPE_VIDEO;
557
555
 	histo->video.release = video_device_release_empty;
558
556
 	histo->video.ioctl_ops = &histo_v4l2_ioctl_ops;
557
+	histo->video.device_caps = V4L2_CAP_META_CAPTURE | V4L2_CAP_STREAMING;
559
558
 
560
559
 	video_set_drvdata(&histo->video, histo);
561
560
 
..
..
@@ -577,7 +576,7 @@
577
576
 
578
577
 	/* ... and register the video device. */
579
578
 	histo->video.queue = &histo->queue;
580
-	ret = video_register_device(&histo->video, VFL_TYPE_GRABBER, -1);
579
+	ret = video_register_device(&histo->video, VFL_TYPE_VIDEO, -1);
581
580
 	if (ret < 0) {
582
581
 		dev_err(vsp1->dev, "failed to register video device\n");
583
582
 		goto error;