update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/common/siano/smscoreapi.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  *  Siano core API module
3
4
  *
..
..
@@ -6,15 +7,6 @@
6
7
  *  author: Uri Shkolnik
7
8
  *
8
9
  *  Copyright (c), 2005-2008 Siano Mobile Silicon, Inc.
9
- *
10
- *  This program is free software; you can redistribute it and/or modify
11
- *  it under the terms of the GNU General Public License version 2 as
12
- *  published by the Free Software Foundation;
13
- *
14
- *  Software distributed under the License is distributed on an "AS IS"
15
- *  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
16
- *
17
- *  See the GNU General Public License for more details.
18
10
  */
19
11
 
20
12
 #include "smscoreapi.h"
..
..
@@ -238,8 +230,8 @@
238
230
 	[MSG_SMS_FLASH_DL_REQ                        - MSG_TYPE_BASE_VAL] = "MSG_SMS_FLASH_DL_REQ",
239
231
 	[MSG_SMS_EXEC_TEST_1_REQ                     - MSG_TYPE_BASE_VAL] = "MSG_SMS_EXEC_TEST_1_REQ",
240
232
 	[MSG_SMS_EXEC_TEST_1_RES                     - MSG_TYPE_BASE_VAL] = "MSG_SMS_EXEC_TEST_1_RES",
241
-	[MSG_SMS_ENBALE_TS_INTERFACE_REQ             - MSG_TYPE_BASE_VAL] = "MSG_SMS_ENBALE_TS_INTERFACE_REQ",
242
-	[MSG_SMS_ENBALE_TS_INTERFACE_RES             - MSG_TYPE_BASE_VAL] = "MSG_SMS_ENBALE_TS_INTERFACE_RES",
233
+	[MSG_SMS_ENABLE_TS_INTERFACE_REQ             - MSG_TYPE_BASE_VAL] = "MSG_SMS_ENABLE_TS_INTERFACE_REQ",
234
+	[MSG_SMS_ENABLE_TS_INTERFACE_RES             - MSG_TYPE_BASE_VAL] = "MSG_SMS_ENABLE_TS_INTERFACE_RES",
243
235
 	[MSG_SMS_SPI_SET_BUS_WIDTH_REQ               - MSG_TYPE_BASE_VAL] = "MSG_SMS_SPI_SET_BUS_WIDTH_REQ",
244
236
 	[MSG_SMS_SPI_SET_BUS_WIDTH_RES               - MSG_TYPE_BASE_VAL] = "MSG_SMS_SPI_SET_BUS_WIDTH_RES",
245
237
 	[MSG_SMS_SEND_EMM_REQ                        - MSG_TYPE_BASE_VAL] = "MSG_SMS_SEND_EMM_REQ",
..
..
@@ -450,7 +442,7 @@
450
442
 	entry = kmalloc(sizeof(*entry), GFP_KERNEL);
451
443
 	if (entry) {
452
444
 		entry->mode = default_mode;
453
-		strlcpy(entry->devpath, devpath, sizeof(entry->devpath));
445
+		strscpy(entry->devpath, devpath, sizeof(entry->devpath));
454
446
 		list_add(&entry->entry, &g_smscore_registry);
455
447
 	} else
456
448
 		pr_err("failed to create smscore_registry.\n");
..
..
@@ -735,7 +727,7 @@
735
727
 	dev->postload_handler = params->postload_handler;
736
728
 
737
729
 	dev->device_flags = params->flags;
738
-	strlcpy(dev->devpath, params->devpath, sizeof(dev->devpath));
730
+	strscpy(dev->devpath, params->devpath, sizeof(dev->devpath));
739
731
 
740
732
 	smscore_registry_settype(dev->devpath, params->device_type);
741
733