Skip to contentSkip to conversation

rsi: Uninitialized return value in rsi_reset_card()

PATCH In review Dan Carpenter 2 participants 2 messages Apr 26, 2018 – Apr 27, 2018

Subsystems (2)
Kernel janitors Redpine wireless driver
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 rsi: Uninitialized return value in rsi_reset_card()

If rsi_usb_master_reg_write() fails then "ret" hasn't been initialized.

Fixes 16d3bb7b2f37 ("rsi: disable fw watchdog timer during reset")
Signed-off-by Dan Carpenter <[email protected]>
drivers/net/wireless/rsi/rsi_91x_usb.c +4 -3
index b065438f51b2..6ce6b754df12 100644
@@ -687,9 +687,10 @@ static int rsi_reset_card(struct rsi_hw *adapter)
 	 */
 	msleep(100);
 
-	if (rsi_usb_master_reg_write(adapter, SWBL_REGOUT,
-				     RSI_FW_WDT_DISABLE_REQ,
-				     RSI_COMMON_REG_SIZE) < 0) {
+	ret = rsi_usb_master_reg_write(adapter, SWBL_REGOUT,
+				       RSI_FW_WDT_DISABLE_REQ,
+				       RSI_COMMON_REG_SIZE);
+	if (ret < 0) {
 		rsi_dbg(ERR_ZONE, "Disabling firmware watchdog timer failed\n");
 		goto fail;
 	}
#1 lore raw
Quoted 10 lines · Dan Carpenter

If rsi_usb_master_reg_write() fails then "ret" hasn't been initialized.

Fixes 16d3bb7b2f37 ("rsi: disable fw watchdog timer during reset")
Signed-off-by Dan Carpenter <[email protected]>
drivers/net/wireless/rsi/rsi_91x_usb.c +0 -0
index b065438f51b2..6ce6b754df12 100644

drivers/net/wireless/rsi/rsi_91x_usb.c static int rsi_reset_card(struct rsi_hw *adapter) · line 693

Quoted 10 lines
drivers/net/wireless/rsi/rsi_91x_usb.c +4 -3
@@ -687,9 +687,10 @@ static int rsi_reset_card(struct rsi_hw *adapter)
 	 */
 	msleep(100);
 
-	if (rsi_usb_master_reg_write(adapter, SWBL_REGOUT,
-				     RSI_FW_WDT_DISABLE_REQ,
-				     RSI_COMMON_REG_SIZE) < 0) {
+	ret = rsi_usb_master_reg_write(adapter, SWBL_REGOUT,
+				       RSI_FW_WDT_DISABLE_REQ,
+				       RSI_COMMON_REG_SIZE);
+	if (ret < 0) {

Odd, I thought I replied to this one already but I don't see my mail on patchwork. Anyway, Gustavo already submitted an identical patch:

https://patchwork.kernel.org/patch/10365985/

Signature · 1 line
Kalle Valo