From: Daniel Golle <daniel@makrotopia.org>
To: linux-wireless@vger.kernel.org
Cc: Roman Yeryomin <roman@advem.lv>, wbob <wbob@jify.de>,
Stanislaw Gruszka <sgruszka@redhat.com>
Subject: [PATCH] rt2800: remove erroneous duplicate condition
Date: Mon, 28 Oct 2019 22:22:44 +0100 [thread overview]
Message-ID: <20191028212244.GA2590@makrotopia.org> (raw)
On 2019-10-28 06:07, wbob wrote:
> Hello Roman,
>
> while reading around drivers/net/wireless/ralink/rt2x00/rt2800lib.c
> I stumbled on what I think is an edit of yours made in error in march
> 2017:
>
> https://github.com/torvalds/linux/commit/41977e86#diff-dae5dc10da180f3b055809a48118e18aR5281
>
> RT6352 in line 5281 should not have been introduced as the "else if"
> below line 5291 can then not take effect for a RT6352 device. Another
> possibility is for line 5291 to be not for RT6352, but this seems
> very unlikely. Are you able to clarify still after this substantial time?
>
> 5277: static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
> ...
> 5279: } else if (rt2x00_rt(rt2x00dev, RT5390) ||
> 5280: rt2x00_rt(rt2x00dev, RT5392) ||
> 5281: rt2x00_rt(rt2x00dev, RT6352)) {
> ...
> 5291: } else if (rt2x00_rt(rt2x00dev, RT6352)) {
> ...
Hence remove erroneous line 5281 to make the driver actually
execute the correct initialization routine for MT7620 chips.
Fixes: 41977e86c984 ("rt2x00: add support for MT7620")
Reported-by: wbob <wbob@jify.de>
Reported-by: Roman Yeryomin <roman@advem.lv>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
index f1cdcd61c54a..c85456c8c193 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
@@ -5839,8 +5839,7 @@ static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
rt2800_register_write(rt2x00dev, TX_TXBF_CFG_0, 0x8000fc21);
rt2800_register_write(rt2x00dev, TX_TXBF_CFG_3, 0x00009c40);
} else if (rt2x00_rt(rt2x00dev, RT5390) ||
- rt2x00_rt(rt2x00dev, RT5392) ||
- rt2x00_rt(rt2x00dev, RT6352)) {
+ rt2x00_rt(rt2x00dev, RT5392)) {
rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404);
rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);
rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000);
--
2.23.0
next reply other threads:[~2019-10-28 21:23 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-28 21:22 Daniel Golle [this message]
2019-10-29 9:18 ` [PATCH] rt2800: remove erroneous duplicate condition Stanislaw Gruszka
2019-10-29 10:05 ` Daniel Golle
2019-11-02 15:46 ` Stanislaw Gruszka
2019-11-02 17:42 ` Daniel Golle
2019-11-03 14:47 ` Stanislaw Gruszka
2019-11-03 15:41 ` Tom Psyborg
2019-11-04 8:48 ` Stanislaw Gruszka
2019-11-04 9:00 ` Daniel Golle
2019-11-04 9:15 ` Stanislaw Gruszka
2019-11-04 13:48 ` Daniel Golle
2019-11-11 11:00 ` Stanislaw Gruszka
2019-11-04 11:48 ` Tom Psyborg
2019-11-02 17:47 ` [PATCH v2] rt2800: remove errornous " Daniel Golle
2019-11-03 14:48 ` Stanislaw Gruszka
2019-11-06 17:57 ` Kalle Valo
-- strict thread matches above, loose matches on Subject: below --
2019-10-28 21:20 [PATCH] rt2800: remove erroneous " Daniel Golle
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=20191028212244.GA2590@makrotopia.org \
--to=daniel@makrotopia.org \
--cc=linux-wireless@vger.kernel.org \
--cc=roman@advem.lv \
--cc=sgruszka@redhat.com \
--cc=wbob@jify.de \
/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;
as well as URLs for NNTP newsgroup(s).