update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/common/saa7146/saa7146_core.c
..
..
@@ -1,21 +1,9 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
     saa7146.o - driver for generic saa7146-based hardware
3
4
 
4
5
     Copyright (C) 1998-2003 Michael Hunold <michael@mihu.de>
5
6
 
6
-    This program is free software; you can redistribute it and/or modify
7
-    it under the terms of the GNU General Public License as published by
8
-    the Free Software Foundation; either version 2 of the License, or
9
-    (at your option) any later version.
10
-
11
-    This program is distributed in the hope that it will be useful,
12
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
13
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
-    GNU General Public License for more details.
15
-
16
-    You should have received a copy of the GNU General Public License
17
-    along with this program; if not, write to the Free Software
18
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
19
7
 */
20
8
 
21
9
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
..
..
@@ -152,7 +140,7 @@
152
140
 	struct page *pg;
153
141
 	int i;
154
142
 
155
-	sglist = kcalloc(nr_pages, sizeof(struct scatterlist), GFP_KERNEL);
143
+	sglist = kmalloc_array(nr_pages, sizeof(struct scatterlist), GFP_KERNEL);
156
144
 	if (NULL == sglist)
157
145
 		return NULL;
158
146
 	sg_init_table(sglist, nr_pages);
..
..
@@ -265,7 +253,7 @@
265
253
 			 i, sg_dma_address(list), sg_dma_len(list),
266
254
 			 list->offset);
267
255
 */
268
-		for (p = 0; p * 4096 < list->length; p++, ptr++) {
256
+		for (p = 0; p * 4096 < sg_dma_len(list); p++, ptr++) {
269
257
 			*ptr = cpu_to_le32(sg_dma_address(list) + p * 4096);
270
258
 			nr_pages++;
271
259
 		}