diff --git a/[refs] b/[refs] index fcca5f5a60f1..ce8b771c5502 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2dd4b26264d48f10e802cc9f2d75542be5a3c7fa +refs/heads/master: cb182a602802b36ff992afe238e1a3eafc0956b2 diff --git a/trunk/drivers/net/wireless/libertas/cmd.c b/trunk/drivers/net/wireless/libertas/cmd.c index 32f9f880a15a..0f07c2ab9cac 100644 --- a/trunk/drivers/net/wireless/libertas/cmd.c +++ b/trunk/drivers/net/wireless/libertas/cmd.c @@ -831,8 +831,8 @@ int lbs_get_channel(struct lbs_private *priv) if (ret) goto out; - lbs_deb_cmd("current radio channel is %d\n", cmd.channel); - ret = (int) cmd.channel; + ret = le16_to_cpu(cmd.channel); + lbs_deb_cmd("current radio channel is %d\n", ret); out: lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret); @@ -863,8 +863,9 @@ int lbs_set_channel(struct lbs_private *priv, u8 channel) if (ret) goto out; - priv->curbssparams.channel = cmd.channel; - lbs_deb_cmd("channel switch from %d to %d\n", old_channel, cmd.channel); + priv->curbssparams.channel = (uint8_t) le16_to_cpu(cmd.channel); + lbs_deb_cmd("channel switch from %d to %d\n", old_channel, + priv->curbssparams.channel); out: lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret);