2011-07-09 11:07:45

by Olivier Sobrie

Subject: [PATCH] libertas: fix errors in functions accessing module registers

Problems located in the two functions lbs_set_reg() and lbs_get_reg():
- The offset field of struct cmd_ds_reg_access was not filled in
- The test on the return code of lbs_cmd_with_response() in function
lbs_get_reg() was inverted

Signed-off-by: Olivier Sobrie <[email protected]>
---
drivers/net/wireless/libertas/cmd.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 71c8f3f..3e8123c 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -873,6 +873,7 @@ int lbs_get_reg(struct lbs_private *priv, u16 reg, u16 offset, u32 *value)
memset(&cmd, 0, sizeof(cmd));
cmd.hdr.size = cpu_to_le16(sizeof(cmd));
cmd.action = cpu_to_le16(CMD_ACT_GET);
+ cmd.offset = cpu_to_le16(offset);

if (reg != CMD_MAC_REG_ACCESS &&
reg != CMD_BBP_REG_ACCESS &&
@@ -882,7 +883,7 @@ int lbs_get_reg(struct lbs_private *priv, u16 reg, u16 offset, u32 *value)
}

ret = lbs_cmd_with_response(priv, reg, &cmd);
- if (ret) {
+ if (!ret) {
if (reg == CMD_BBP_REG_ACCESS || reg == CMD_RF_REG_ACCESS)
*value = cmd.value.bbp_rf;
else if (reg == CMD_MAC_REG_ACCESS)
@@ -915,6 +916,7 @@ int lbs_set_reg(struct lbs_private *priv, u16 reg, u16 offset, u32 value)
memset(&cmd, 0, sizeof(cmd));
cmd.hdr.size = cpu_to_le16(sizeof(cmd));
cmd.action = cpu_to_le16(CMD_ACT_SET);
+ cmd.offset = cpu_to_le16(offset);

if (reg == CMD_BBP_REG_ACCESS || reg == CMD_RF_REG_ACCESS)
cmd.value.bbp_rf = (u8) (value & 0xFF);
--
1.7.6

2011-07-11 23:23:01

by Dan Williams

Subject: Re: [PATCH] libertas: fix errors in functions accessing module registers

On Sat, 2011-07-09 at 12:57 +0200, Olivier Sobrie wrote:
> Problems located in the two functions lbs_set_reg() and lbs_get_reg():
> - The offset field of struct cmd_ds_reg_access was not filled in
> - The test on the return code of lbs_cmd_with_response() in function
> lbs_get_reg() was inverted
>
> Signed-off-by: Olivier Sobrie <[email protected]>

Acked-by: Dan Williams <[email protected]>

> ---
> drivers/net/wireless/libertas/cmd.c | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
> index 71c8f3f..3e8123c 100644
> --- a/drivers/net/wireless/libertas/cmd.c
> +++ b/drivers/net/wireless/libertas/cmd.c
> @@ -873,6 +873,7 @@ int lbs_get_reg(struct lbs_private *priv, u16 reg, u16 offset, u32 *value)
> memset(&cmd, 0, sizeof(cmd));
> cmd.hdr.size = cpu_to_le16(sizeof(cmd));
> cmd.action = cpu_to_le16(CMD_ACT_GET);
> + cmd.offset = cpu_to_le16(offset);
>
> if (reg != CMD_MAC_REG_ACCESS &&
> reg != CMD_BBP_REG_ACCESS &&
> @@ -882,7 +883,7 @@ int lbs_get_reg(struct lbs_private *priv, u16 reg, u16 offset, u32 *value)
> }
>
> ret = lbs_cmd_with_response(priv, reg, &cmd);
> - if (ret) {
> + if (!ret) {
> if (reg == CMD_BBP_REG_ACCESS || reg == CMD_RF_REG_ACCESS)
> *value = cmd.value.bbp_rf;
> else if (reg == CMD_MAC_REG_ACCESS)
> @@ -915,6 +916,7 @@ int lbs_set_reg(struct lbs_private *priv, u16 reg, u16 offset, u32 value)
> memset(&cmd, 0, sizeof(cmd));
> cmd.hdr.size = cpu_to_le16(sizeof(cmd));
> cmd.action = cpu_to_le16(CMD_ACT_SET);
> + cmd.offset = cpu_to_le16(offset);
>
> if (reg == CMD_BBP_REG_ACCESS || reg == CMD_RF_REG_ACCESS)
> cmd.value.bbp_rf = (u8) (value & 0xFF);