forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-10-22 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5 
 kernel/net/caif/cfrfml.c
....@@ -1,7 +1,7 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23  * Copyright (C) ST-Ericsson AB 2010
34  * Author:	Sjur Brendeland
4
- * License terms: GNU General Public License (GPL) version 2
55  */
66 
77 #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__
....@@ -116,7 +116,7 @@
116116 	if (segmented) {
117117 		if (rfml->incomplete_frm == NULL) {
118118 			/* Initial Segment */
119
-			if (cfpkt_peek_head(pkt, rfml->seghead, 6) < 0)
119
+			if (cfpkt_peek_head(pkt, rfml->seghead, 6) != 0)
120120 				goto out;
121121 
122122 			rfml->pdu_size = get_unaligned_le16(rfml->seghead+4);
....@@ -233,7 +233,7 @@
233233 	if (cfpkt_getlen(pkt) > rfml->fragment_size + RFM_HEAD_SIZE)
234234 		err = cfpkt_peek_head(pkt, head, 6);
235235 
236
-	if (err < 0)
236
+	if (err != 0)
237237 		goto out;
238238 
239239 	while (cfpkt_getlen(frontpkt) > rfml->fragment_size + RFM_HEAD_SIZE) {
....@@ -264,9 +264,6 @@
264264 		frontpkt = rearpkt;
265265 		rearpkt = NULL;
266266 
267
-		err = -ENOMEM;
268
-		if (frontpkt == NULL)
269
-			goto out;
270267 		err = -EPROTO;
271268 		if (cfpkt_add_head(frontpkt, head, 6) < 0)
272269 			goto out;