update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/pci/cx18/cx18-driver.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  *  cx18 driver initialization and card probing
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"
..
..
@@ -328,7 +319,7 @@
328
319
 	if (!c)
329
320
 		return;
330
321
 
331
-	strlcpy(c->name, "cx18 tveeprom tmp", sizeof(c->name));
322
+	strscpy(c->name, "cx18 tveeprom tmp", sizeof(c->name));
332
323
 	c->adapter = &cx->i2c_adap[0];
333
324
 	c->addr = 0xa0 >> 1;
334
325
 
..
..
@@ -685,7 +676,7 @@
685
676
 			 cx->pci_dev->subsystem_device);
686
677
 		CX18_ERR("Defaulting to %s card\n", cx->card->name);
687
678
 		CX18_ERR("Please mail the vendor/device and subsystem vendor/device IDs and what kind of\n");
688
-		CX18_ERR("card you have to the ivtv-devel mailinglist (www.ivtvdriver.org)\n");
679
+		CX18_ERR("card you have to the linux-media mailinglist (www.linuxtv.org)\n");
689
680
 		CX18_ERR("Prefix your subject line with [UNKNOWN CX18 CARD].\n");
690
681
 	}
691
682
 	cx->v4l2_cap = cx->card->v4l2_capabilities;
..
..
@@ -947,7 +938,7 @@
947
938
 	/* map io memory */
948
939
 	CX18_DEBUG_INFO("attempting ioremap at 0x%llx len 0x%08x\n",
949
940
 		   (u64)cx->base_addr + CX18_MEM_OFFSET, CX18_MEM_SIZE);
950
-	cx->enc_mem = ioremap_nocache(cx->base_addr + CX18_MEM_OFFSET,
941
+	cx->enc_mem = ioremap(cx->base_addr + CX18_MEM_OFFSET,
951
942
 				       CX18_MEM_SIZE);
952
943
 	if (!cx->enc_mem) {
953
944
 		CX18_ERR("ioremap failed. Can't get a window into CX23418 memory and register space\n");