2015-02-25 13:25:23

by Dan Carpenter

Subject: [patch] rtlwifi: rtl8188ee: missing curly braces in handle_branch1()

>From the indenting, it seems like the READ_NEXT_PAIR() was supposed to
be inside the while loop.

Signed-off-by: Dan Carpenter <[email protected]>

diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/phy.c b/drivers/net/wireless/rtlwifi/rtl8188ee/phy.c
index 3f6c59c..a2bb02c 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/phy.c
@@ -452,9 +452,10 @@ static void handle_branch1(struct ieee80211_hw *hw, u16 arraylen,
READ_NEXT_PAIR(v1, v2, i);
while (v2 != 0xDEAD &&
v2 != 0xCDEF &&
- v2 != 0xCDCD && i < arraylen - 2)
+ v2 != 0xCDCD && i < arraylen - 2) {
_rtl8188e_config_bb_reg(hw, v1, v2);
READ_NEXT_PAIR(v1, v2, i);
+ }

while (v2 != 0xDEAD && i < arraylen - 2)
READ_NEXT_PAIR(v1, v2, i);

2015-02-25 16:34:10

by Larry Finger

Subject: Re: [patch] rtlwifi: rtl8188ee: missing curly braces in handle_branch1()

On 02/25/2015 07:24 AM, Dan Carpenter wrote:
>>From the indenting, it seems like the READ_NEXT_PAIR() was supposed to
> be inside the while loop.
>
> Signed-off-by: Dan Carpenter <[email protected]>

Good catch.

Acked-by: Larry Finger <[email protected]>

Thanks,

Larry

>
> diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/phy.c b/drivers/net/wireless/rtlwifi/rtl8188ee/phy.c
> index 3f6c59c..a2bb02c 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8188ee/phy.c
> +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/phy.c
> @@ -452,9 +452,10 @@ static void handle_branch1(struct ieee80211_hw *hw, u16 arraylen,
> READ_NEXT_PAIR(v1, v2, i);
> while (v2 != 0xDEAD &&
> v2 != 0xCDEF &&
> - v2 != 0xCDCD && i < arraylen - 2)
> + v2 != 0xCDCD && i < arraylen - 2) {
> _rtl8188e_config_bb_reg(hw, v1, v2);
> READ_NEXT_PAIR(v1, v2, i);
> + }
>
> while (v2 != 0xDEAD && i < arraylen - 2)
> READ_NEXT_PAIR(v1, v2, i);
>

2015-03-03 13:43:00

by Kalle Valo

Subject: Re: rtlwifi: rtl8188ee: missing curly braces in handle_branch1()

> From the indenting, it seems like the READ_NEXT_PAIR() was supposed to
> be inside the while loop.
>
> Signed-off-by: Dan Carpenter <[email protected]>
> Acked-by: Larry Finger <[email protected]>

Thanks, applied to wireless-drivers-next.git.

Kalle Valo