From: Stanislaw Gruszka <sgruszka@redhat.com>
To: linux-wireless@vger.kernel.org
Cc: Helmut Schaa <helmut.schaa@googlemail.com>,
Mathias Kresin <dev@kresin.me>
Subject: [PATCH v2 2/9] rt2800usb: do not wipe out USB_DMA_CFG settings
Date: Fri, 18 Nov 2016 10:43:54 +0100 [thread overview]
Message-ID: <1479462241-9299-3-git-send-email-sgruszka@redhat.com> (raw)
In-Reply-To: <1479462241-9299-1-git-send-email-sgruszka@redhat.com>
We should not reset USB_DMA_CFG on rt2800usb_init_registers() as this
function is called indirectly from rt2800_enable_radio(). If we
do so, we wipe out USB_DMA_CFG settings from rt2800usb_enable_radio().
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
---
drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800usb.c b/drivers/net/wireless/ralink/rt2x00/rt2800usb.c
index 4b0bb6b..9f61293 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800usb.c
@@ -341,8 +341,6 @@ static int rt2800usb_init_registers(struct rt2x00_dev *rt2x00dev)
rt2x00_set_field32(®, MAC_SYS_CTRL_RESET_BBP, 1);
rt2x00usb_register_write(rt2x00dev, MAC_SYS_CTRL, reg);
- rt2x00usb_register_write(rt2x00dev, USB_DMA_CFG, 0x00000000);
-
rt2x00usb_vendor_request_sw(rt2x00dev, USB_DEVICE_MODE, 0,
USB_MODE_RESET, REGISTER_TIMEOUT);
@@ -353,12 +351,11 @@ static int rt2800usb_init_registers(struct rt2x00_dev *rt2x00dev)
static int rt2800usb_enable_radio(struct rt2x00_dev *rt2x00dev)
{
- u32 reg;
+ u32 reg = 0;
if (unlikely(rt2800_wait_wpdma_ready(rt2x00dev)))
return -EIO;
- rt2x00usb_register_read(rt2x00dev, USB_DMA_CFG, ®);
rt2x00_set_field32(®, USB_DMA_CFG_PHY_CLEAR, 0);
rt2x00_set_field32(®, USB_DMA_CFG_RX_BULK_AGG_EN, 0);
rt2x00_set_field32(®, USB_DMA_CFG_RX_BULK_AGG_TIMEOUT, 128);
--
1.8.3.1
next prev parent reply other threads:[~2016-11-18 9:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-18 9:43 [PATCH v2 0/9] rt2800: random fixes Stanislaw Gruszka
2016-11-18 9:43 ` [PATCH v2 1/9] rt2800: correctly report MCS TX parameters Stanislaw Gruszka
2016-11-23 15:39 ` [v2,1/9] " Kalle Valo
2016-11-18 9:43 ` Stanislaw Gruszka [this message]
2016-11-18 9:43 ` [PATCH v2 3/9] rt2800: OFDM rates are mandatory Stanislaw Gruszka
2016-11-18 9:43 ` [PATCH v2 4/9] rt2800: do not overwrite WPDMA_GLO_CFG_WP_DMA_BURST_SIZE Stanislaw Gruszka
2016-11-18 9:43 ` [PATCH v2 5/9] rt2800: correct AUTO_RSP_CFG Stanislaw Gruszka
2016-11-18 9:43 ` [PATCH v2 6/9] rt2800: correct TX_SW_CFG1 for 5592 Stanislaw Gruszka
2016-11-18 9:43 ` [PATCH v2 7/9] rt2800: use RTS/CTS protection instead of CTS-to-self Stanislaw Gruszka
2016-11-18 9:44 ` [PATCH v2 8/9] rt2800: tune *_PROT_CFG parameters Stanislaw Gruszka
2016-11-18 9:44 ` [PATCH v2 9/9] rt2800: disable CCK rates on HT Stanislaw Gruszka
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=1479462241-9299-3-git-send-email-sgruszka@redhat.com \
--to=sgruszka@redhat.com \
--cc=dev@kresin.me \
--cc=helmut.schaa@googlemail.com \
--cc=linux-wireless@vger.kernel.org \
/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).