From: Pavel Skripkin <paskripkin@gmail.com>
To: davem@davemloft.net, kuba@kernel.org, linux@rempel-privat.de,
andrew@lunn.ch, robert.foss@collabora.com, freddy@asix.com.tw
Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org,
Pavel Skripkin <paskripkin@gmail.com>
Subject: [PATCH 2/2] asix: fix wrong return value in asix_check_host_enable()
Date: Tue, 21 Dec 2021 22:40:05 +0300 [thread overview]
Message-ID: <989915c5f8887e4a0281ed87325277aa8c997291.1640115493.git.paskripkin@gmail.com> (raw)
In-Reply-To: <bd6a7e1779ba97a300650e8e23b69ecffb3b4236.1640115493.git.paskripkin@gmail.com>
If asix_read_cmd() returns 0 on 30th interation, 0 will be returned from
asix_check_host_enable(), which is logically wrong. Fix it by returning
-ETIMEDOUT explicitly if we have exceeded 30 iterations
Fixes: a786e3195d6a ("net: asix: fix uninit value bugs")
Reported-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
---
drivers/net/usb/asix_common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/usb/asix_common.c b/drivers/net/usb/asix_common.c
index 06823d7141b6..8c61d410a123 100644
--- a/drivers/net/usb/asix_common.c
+++ b/drivers/net/usb/asix_common.c
@@ -83,7 +83,7 @@ static int asix_check_host_enable(struct usbnet *dev, int in_pm)
break;
}
- return ret;
+ return i >= 30? -ETIMEDOUT: ret;
}
static void reset_asix_rx_fixup_info(struct asix_rx_fixup_info *rx)
--
2.34.1
next prev parent reply other threads:[~2021-12-21 19:40 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-21 19:39 [PATCH 1/2] asix: fix uninit-value in asix_mdio_read() Pavel Skripkin
2021-12-21 19:40 ` Pavel Skripkin [this message]
2021-12-21 19:44 ` [PATCH 2/2] asix: fix wrong return value in asix_check_host_enable() Andrew Lunn
2021-12-21 20:00 ` Pavel Skripkin
2021-12-21 19:42 ` [PATCH 1/2] asix: fix uninit-value in asix_mdio_read() Andrew Lunn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=989915c5f8887e4a0281ed87325277aa8c997291.1640115493.git.paskripkin@gmail.com \
--to=paskripkin@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=freddy@asix.com.tw \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@rempel-privat.de \
--cc=netdev@vger.kernel.org \
--cc=robert.foss@collabora.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®