| Message ID | 1394712342-15778-358-Taiwan-albertk@realtek.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f49c35b89b784c20a8868bb6f57f3e25277268c3 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] r8152: replace return with break for ram code speedup mode timeout | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | warning | 2 maintainers not CCed: lee.jones@linaro.org treding@nvidia.com |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 8 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): On Thu, 22 Apr 2021 16:48:02 +0800 you wrote: > When the timeout occurs, we still have to run the following process > for releasing patch request. Otherwise, the PHY would keep no link. > Therefore, use break to stop the loop of loading firmware and > release the patch request rather than return the function directly. > > Fixes: 4a51b0e8a014 ("r8152: support PHY firmware for RTL8156 series") > Signed-off-by: Hayes Wang <hayeswang@realtek.com> > > [...] Here is the summary with links: - [net-next] r8152: replace return with break for ram code speedup mode timeout https://git.kernel.org/netdev/net-next/c/f49c35b89b78 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 9119a860e9bd..5b4ed69df64f 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -4803,7 +4803,7 @@ static void rtl_ram_code_speed_up(struct r8152 *tp, struct fw_phy_speed_up *phy, if (i == 1000) { dev_err(&tp->intf->dev, "ram code speedup mode timeout\n"); - return; + break; } }
When the timeout occurs, we still have to run the following process for releasing patch request. Otherwise, the PHY would keep no link. Therefore, use break to stop the loop of loading firmware and release the patch request rather than return the function directly. Fixes: 4a51b0e8a014 ("r8152: support PHY firmware for RTL8156 series") Signed-off-by: Hayes Wang <hayeswang@realtek.com> --- drivers/net/usb/r8152.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)