update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/pci/cx88/cx88-i2c.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 
2
3
 /*
3
4
  *
..
..
@@ -7,19 +8,8 @@
7
8
  *			   & Marcus Metzler (mocm@thp.uni-koeln.de)
8
9
  * (c) 2002 Yurij Sysoev <yurij@naturesoft.net>
9
10
  * (c) 1999-2003 Gerd Knorr <kraxel@bytesex.org>
10
- *
11
11
  * (c) 2005 Mauro Carvalho Chehab <mchehab@kernel.org>
12
12
  *	- Multituner support and i2c address binding
13
- *
14
- * This program is free software; you can redistribute it and/or modify
15
- * it under the terms of the GNU General Public License as published by
16
- * the Free Software Foundation; either version 2 of the License, or
17
- * (at your option) any later version.
18
- *
19
- * This program is distributed in the hope that it will be useful,
20
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
21
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
22
- * GNU General Public License for more details.
23
13
  */
24
14
 
25
15
 #include "cx88.h"
..
..
@@ -140,14 +130,14 @@
140
130
 	core->i2c_algo = cx8800_i2c_algo_template;
141
131
 
142
132
 	core->i2c_adap.dev.parent = &pci->dev;
143
-	strlcpy(core->i2c_adap.name, core->name, sizeof(core->i2c_adap.name));
133
+	strscpy(core->i2c_adap.name, core->name, sizeof(core->i2c_adap.name));
144
134
 	core->i2c_adap.owner = THIS_MODULE;
145
135
 	core->i2c_algo.udelay = i2c_udelay;
146
136
 	core->i2c_algo.data = core;
147
137
 	i2c_set_adapdata(&core->i2c_adap, &core->v4l2_dev);
148
138
 	core->i2c_adap.algo_data = &core->i2c_algo;
149
139
 	core->i2c_client.adapter = &core->i2c_adap;
150
-	strlcpy(core->i2c_client.name, "cx88xx internal", I2C_NAME_SIZE);
140
+	strscpy(core->i2c_client.name, "cx88xx internal", I2C_NAME_SIZE);
151
141
 
152
142
 	cx8800_bit_setscl(core, 1);
153
143
 	cx8800_bit_setsda(core, 1);