[v1] staging: rtl8712: Fix alignment checks with flipped condition

[PATCH] staging: rtl8712: Fix alignment checks with flipped condition

Posted by Ismayil Mirzali 4 years, 6 months ago

From: Ngo Tak Fong <simon.fodin@gmail.com>

Fixed two CHECKs of Alignment should match open parenthesis and flipped
a condition to pull the code in one tab.

Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Ngo Tak Fong <simon.fodin@gmail.com>
Link: https://lore.kernel.org/r/20211207212223.GA70594@simon-desktop
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/staging/rtl8712/rtl8712_efuse.c | 28 ++++++++++++-------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/drivers/staging/rtl8712/rtl8712_efuse.c b/drivers/staging/rtl8712/rtl8712_efuse.c
index 4f3b54a7c3be..c9400e40a1d6 100644
--- a/drivers/staging/rtl8712/rtl8712_efuse.c
+++ b/drivers/staging/rtl8712/rtl8712_efuse.c
@@ -298,25 +298,23 @@ static u8 fix_header(struct _adapter *adapter, u8 header, u16 header_addr)
 			continue;
 		}
 		for (i = 0; i < PGPKG_MAX_WORDS; i++) {
-			if (BIT(i) & word_en) {
-				if (BIT(i) & pkt.word_en) {
-					if (efuse_one_byte_read(
-							adapter, addr,
+			if (!(BIT(i) & word_en))
+				continue;
+			if (BIT(i) & pkt.word_en) {
+				if (efuse_one_byte_read(adapter,
+							addr,
 							&value))
-						pkt.data[i * 2] = value;
-					else
-						return false;
-					if (efuse_one_byte_read(
-							adapter,
+					pkt.data[i * 2] = value;
+				else
+					return false;
+				if (efuse_one_byte_read(adapter,
 							addr + 1,
 							&value))
-						pkt.data[i * 2 + 1] =
-							value;
-					else
-						return false;
-				}
-				addr += 2;
+					pkt.data[i * 2 + 1] = value;
+				else
+					return false;
 			}
+			addr += 2;
 		}
 	}
 	if (addr != header_addr)
-- 
2.25.1

Re: [PATCH] staging: rtl8712: Fix alignment checks with flipped condition

Posted by Pavel Skripkin 4 years, 6 months ago

On 12/18/21 23:28, Ismayil Mirzali wrote:
> From: Ngo Tak Fong <simon.fodin@gmail.com>
> 
> Fixed two CHECKs of Alignment should match open parenthesis and flipped
> a condition to pull the code in one tab.
> 
> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Ngo Tak Fong <simon.fodin@gmail.com>
> Link: https://lore.kernel.org/r/20211207212223.GA70594@simon-desktop
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---

This one is already applied to staging-testing.
See commit d0df53d36cd51154463796bc6abdd11abdbc67c1

Looks like you have sent it by accident



With regards,
Pavel Skripkin