update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/pci/cx18/cx18-cards.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  *  cx18 functions to query card hardware
3
4
  *
..
..
@@ -5,16 +6,6 @@
5
6
  *
6
7
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
7
8
  *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
8
- *
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
9
  */
19
10
 
20
11
 #include "cx18-driver.h"
..
..
@@ -44,7 +35,7 @@
44
35
 	.tv    = { 0x61, 0x60, I2C_CLIENT_END },
45
36
 };
46
37
 
47
-/* Please add new PCI IDs to: http://pci-ids.ucw.cz/
38
+/* Please add new PCI IDs to: https://pci-ids.ucw.cz/
48
39
    This keeps the PCI ID database up to date. Note that the entries
49
40
    must be added under vendor 0x4444 (Conexant) as subsystem IDs.
50
41
    New vendor IDs should still be added to the vendor ID list. */
..
..
@@ -254,7 +245,7 @@
254
245
 	.type = CX18_CARD_YUAN_MPC718,
255
246
 	.name = "Yuan MPC718 MiniPCI DVB-T/Analog",
256
247
 	.comment = "Experimenters needed for device to work well.\n"
257
-		  "\tTo help, mail the ivtv-devel list (www.ivtvdriver.org).\n",
248
+		  "\tTo help, mail the linux-media list (www.linuxtv.org).\n",
258
249
 	.v4l2_capabilities = CX18_CAP_ENCODER,
259
250
 	.hw_audio_ctrl = CX18_HW_418_AV,
260
251
 	.hw_muxer = CX18_HW_GPIO_MUX,
..
..
@@ -314,7 +305,7 @@
314
305
 	.type = CX18_CARD_GOTVIEW_PCI_DVD3,
315
306
 	.name = "GoTView PCI DVD3 Hybrid",
316
307
 	.comment = "Experimenters needed for device to work well.\n"
317
-		  "\tTo help, mail the ivtv-devel list (www.ivtvdriver.org).\n",
308
+		  "\tTo help, mail the linux-media list (www.linuxtv.org).\n",
318
309
 	.v4l2_capabilities = CX18_CAP_ENCODER,
319
310
 	.hw_audio_ctrl = CX18_HW_418_AV,
320
311
 	.hw_muxer = CX18_HW_GPIO_MUX,
..
..
@@ -428,7 +419,7 @@
428
419
 	.type = CX18_CARD_TOSHIBA_QOSMIO_DVBT,
429
420
 	.name = "Toshiba Qosmio DVB-T/Analog",
430
421
 	.comment = "Experimenters and photos needed for device to work well.\n"
431
-		  "\tTo help, mail the ivtv-devel list (www.ivtvdriver.org).\n",
422
+		  "\tTo help, mail the linux-media list (www.linuxtv.org).\n",
432
423
 	.v4l2_capabilities = CX18_CAP_ENCODER,
433
424
 	.hw_audio_ctrl = CX18_HW_418_AV,
434
425
 	.hw_all = CX18_HW_418_AV | CX18_HW_TUNER | CX18_HW_GPIO_RESET_CTRL,
..
..
@@ -471,7 +462,7 @@
471
462
 	.type = CX18_CARD_LEADTEK_PVR2100,
472
463
 	.name = "Leadtek WinFast PVR2100",
473
464
 	.comment = "Experimenters and photos needed for device to work well.\n"
474
-		  "\tTo help, mail the ivtv-devel list (www.ivtvdriver.org).\n",
465
+		  "\tTo help, mail the linux-media list (www.linuxtv.org).\n",
475
466
 	.v4l2_capabilities = CX18_CAP_ENCODER,
476
467
 	.hw_audio_ctrl = CX18_HW_418_AV,
477
468
 	.hw_muxer = CX18_HW_GPIO_MUX,
..
..
@@ -602,8 +593,8 @@
602
593
 	if (index >= cx->nof_inputs)
603
594
 		return -EINVAL;
604
595
 	input->index = index;
605
-	strlcpy(input->name, input_strs[card_input->video_type - 1],
606
-			sizeof(input->name));
596
+	strscpy(input->name, input_strs[card_input->video_type - 1],
597
+		sizeof(input->name));
607
598
 	input->type = (card_input->video_type == CX18_CARD_INPUT_VID_TUNER ?
608
599
 			V4L2_INPUT_TYPE_TUNER : V4L2_INPUT_TYPE_CAMERA);
609
600
 	input->audioset = (1 << cx->nof_audio_inputs) - 1;
..
..
@@ -625,8 +616,8 @@
625
616
 	memset(audio, 0, sizeof(*audio));
626
617
 	if (index >= cx->nof_audio_inputs)
627
618
 		return -EINVAL;
628
-	strlcpy(audio->name, input_strs[aud_input->audio_type - 1],
629
-			sizeof(audio->name));
619
+	strscpy(audio->name, input_strs[aud_input->audio_type - 1],
620
+		sizeof(audio->name));
630
621
 	audio->index = index;
631
622
 	audio->capability = V4L2_AUDCAP_STEREO;
632
623
 	return 0;