update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/pci/saa7146/mxb.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
     mxb - v4l2 driver for the Multimedia eXtension Board
3
4
 
..
..
@@ -6,19 +7,6 @@
6
7
     Visit http://www.themm.net/~mihu/linux/saa7146/mxb.html
7
8
     for further details about this card.
8
9
 
9
-    This program is free software; you can redistribute it and/or modify
10
-    it under the terms of the GNU General Public License as published by
11
-    the Free Software Foundation; either version 2 of the License, or
12
-    (at your option) any later version.
13
-
14
-    This program is distributed in the hope that it will be useful,
15
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
16
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17
-    GNU General Public License for more details.
18
-
19
-    You should have received a copy of the GNU General Public License
20
-    along with this program; if not, write to the Free Software
21
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22
10
 */
23
11
 
24
12
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
..
..
@@ -399,7 +387,7 @@
399
387
 
400
388
 	/* check if the saa7740 (aka 'sound arena module') is present
401
389
 	   on the mxb. if so, we must initialize it. due to lack of
402
-	   informations about the saa7740, the values were reverse
390
+	   information about the saa7740, the values were reverse
403
391
 	   engineered. */
404
392
 	msg.addr = 0x1b;
405
393
 	msg.flags = 0;
..
..
@@ -495,7 +483,7 @@
495
483
 			input_port_selection[input].hps_sync);
496
484
 
497
485
 	/* prepare switching of tea6415c and saa7111a;
498
-	   have a look at the 'background'-file for further informations  */
486
+	   have a look at the 'background'-file for further information  */
499
487
 	switch (input) {
500
488
 	case TUNER:
501
489
 		i = SAA7115_COMPOSITE0;
..
..
@@ -553,7 +541,7 @@
553
541
 	DEB_EE("VIDIOC_G_TUNER: %d\n", t->index);
554
542
 
555
543
 	memset(t, 0, sizeof(*t));
556
-	strlcpy(t->name, "TV Tuner", sizeof(t->name));
544
+	strscpy(t->name, "TV Tuner", sizeof(t->name));
557
545
 	t->type = V4L2_TUNER_ANALOG_TV;
558
546
 	t->capability = V4L2_TUNER_CAP_NORM | V4L2_TUNER_CAP_STEREO |
559
547
 			V4L2_TUNER_CAP_LANG1 | V4L2_TUNER_CAP_LANG2 | V4L2_TUNER_CAP_SAP;
..
..
@@ -726,7 +714,7 @@
726
714
 	vv_data.vid_ops.vidioc_g_register = vidioc_g_register;
727
715
 	vv_data.vid_ops.vidioc_s_register = vidioc_s_register;
728
716
 #endif
729
-	if (saa7146_register_device(&mxb->video_dev, dev, "mxb", VFL_TYPE_GRABBER)) {
717
+	if (saa7146_register_device(&mxb->video_dev, dev, "mxb", VFL_TYPE_VIDEO)) {
730
718
 		ERR("cannot register capture v4l2 device. skipping.\n");
731
719
 		saa7146_vv_release(dev);
732
720
 		return -1;