Skip to contentSkip to conversation

rtw89: pci: reversed conditions in rtw89_write16_mdio_mask()

PATCH In review Dan Carpenter 2 participants 2 messages Apr 9, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rtw89: pci: reversed conditions in rtw89_write16_mdio_mask()

These if conditions are reversed so it will just return success without writing.

Fixes 740c431c22fe ("rtw89: pci: add register definition to rtw89_pci_info to generalize pci code")
---
 drivers/net/wireless/realtek/rtw89/pci.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/pci.c +2 -2
index dcf907b81cff..ecb419010f0c 100644
@@ -1522,7 +1522,7 @@ rtw89_write16_mdio_mask(struct rtw89_dev *rtwdev, u8 addr, u16 mask, u16 data, u
 	u16 val;
 
 	ret = rtw89_read16_mdio(rtwdev, addr, speed, &val);
-	if (!ret)
+	if (ret)
 		return ret;
 
 	shift = __ffs(mask);
@@ -1530,7 +1530,7 @@ rtw89_write16_mdio_mask(struct rtw89_dev *rtwdev, u8 addr, u16 mask, u16 data, u
 	val |= ((data << shift) & mask);
 
 	ret = rtw89_write16_mdio(rtwdev, addr, val, speed);
-	if (!ret)
+	if (ret)
 		return ret;
 
 	return 0;
Signature · 1 line
2.20.1
maintainer
#1 lore raw
Quoted 26 lines · Dan Carpenter

These if conditions are reversed so it will just return success without writing.

Fixes 740c431c22fe ("rtw89: pci: add register definition to rtw89_pci_info to generalize pci

code")

---
 drivers/net/wireless/realtek/rtw89/pci.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw89/pci.c +0 -0
index dcf907b81cff..ecb419010f0c 100644
@@ -1522,7 +1522,7 @@ rtw89_write16_mdio_mask(struct rtw89_dev *rtwdev, u8 addr, u16 mask, u16

data, u

drivers/net/wireless/realtek/rtw89/pci.c +1 -1
 	u16 val;
 
 	ret = rtw89_read16_mdio(rtwdev, addr, speed, &val);
-	if (!ret)
+	if (ret)
 		return ret;
 
 	shift = __ffs(mask);
@@ -1530,7 +1530,7 @@ rtw89_write16_mdio_mask(struct rtw89_dev *rtwdev, u8 addr, u16 mask, u16

data, u

drivers/net/wireless/realtek/rtw89/pci.c rtw89_write16_mdio_mask(struct rtw89_dev *rtwdev, u8 addr, u16 mask, u16 data, u · line 1536

Quoted 8 lines
drivers/net/wireless/realtek/rtw89/pci.c +1 -1
 	val |= ((data << shift) & mask);
 
 	ret = rtw89_write16_mdio(rtwdev, addr, val, speed);
-	if (!ret)
+	if (ret)
 		return ret;
 
 	return 0;

I have found and sent a patch to fix this:
https://lore.kernel.org/linux-wireless/[email protected]/T/#u

Thank you
Ping-Ke