Commit fb21d146 authored by Zhang Changzhong's avatar Zhang Changzhong Committed by Kalle Valo

rsi: fix error return code in rsi_reset_card()

Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.

Fixes: 17ff2c79 ("rsi: reset device changes for 9116")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/1605582454-39649-1-git-send-email-zhangchangzhong@huawei.com
parent 01c195de
...@@ -743,25 +743,25 @@ static int rsi_reset_card(struct rsi_hw *adapter) ...@@ -743,25 +743,25 @@ static int rsi_reset_card(struct rsi_hw *adapter)
if (ret < 0) if (ret < 0)
goto fail; goto fail;
} else { } else {
if ((rsi_usb_master_reg_write(adapter, ret = rsi_usb_master_reg_write(adapter,
NWP_WWD_INTERRUPT_TIMER, NWP_WWD_INTERRUPT_TIMER,
NWP_WWD_INT_TIMER_CLKS, NWP_WWD_INT_TIMER_CLKS,
RSI_9116_REG_SIZE)) < 0) { RSI_9116_REG_SIZE);
if (ret < 0)
goto fail; goto fail;
} ret = rsi_usb_master_reg_write(adapter,
if ((rsi_usb_master_reg_write(adapter,
NWP_WWD_SYSTEM_RESET_TIMER, NWP_WWD_SYSTEM_RESET_TIMER,
NWP_WWD_SYS_RESET_TIMER_CLKS, NWP_WWD_SYS_RESET_TIMER_CLKS,
RSI_9116_REG_SIZE)) < 0) { RSI_9116_REG_SIZE);
if (ret < 0)
goto fail; goto fail;
} ret = rsi_usb_master_reg_write(adapter,
if ((rsi_usb_master_reg_write(adapter,
NWP_WWD_MODE_AND_RSTART, NWP_WWD_MODE_AND_RSTART,
NWP_WWD_TIMER_DISABLE, NWP_WWD_TIMER_DISABLE,
RSI_9116_REG_SIZE)) < 0) { RSI_9116_REG_SIZE);
if (ret < 0)
goto fail; goto fail;
} }
}
rsi_dbg(INFO_ZONE, "Reset card done\n"); rsi_dbg(INFO_ZONE, "Reset card done\n");
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment