forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-10 cde9070d9970eef1f7ec2360586c802a16230ad8
kernel/drivers/media/common/saa7146/saa7146_core.c
....@@ -1,21 +1,9 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
12 /*
23 saa7146.o - driver for generic saa7146-based hardware
34
45 Copyright (C) 1998-2003 Michael Hunold <michael@mihu.de>
56
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.
197 */
208
219 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
....@@ -152,7 +140,7 @@
152140 struct page *pg;
153141 int i;
154142
155
- sglist = kcalloc(nr_pages, sizeof(struct scatterlist), GFP_KERNEL);
143
+ sglist = kmalloc_array(nr_pages, sizeof(struct scatterlist), GFP_KERNEL);
156144 if (NULL == sglist)
157145 return NULL;
158146 sg_init_table(sglist, nr_pages);
....@@ -265,7 +253,7 @@
265253 i, sg_dma_address(list), sg_dma_len(list),
266254 list->offset);
267255 */
268
- for (p = 0; p * 4096 < list->length; p++, ptr++) {
256
+ for (p = 0; p * 4096 < sg_dma_len(list); p++, ptr++) {
269257 *ptr = cpu_to_le32(sg_dma_address(list) + p * 4096);
270258 nr_pages++;
271259 }