aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/libertas')
-rw-r--r--drivers/net/wireless/libertas/assoc.c10
-rw-r--r--drivers/net/wireless/libertas/cmd.c8
-rw-r--r--drivers/net/wireless/libertas/if_usb.c2
3 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index 7b672fe62cf9..21a569617421 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -198,7 +198,7 @@ static int assoc_helper_channel(struct lbs_private *priv,
198 198
199 ret = update_channel(priv); 199 ret = update_channel(priv);
200 if (ret < 0) { 200 if (ret < 0) {
201 lbs_deb_assoc("ASSOC: channel: error getting channel."); 201 lbs_deb_assoc("ASSOC: channel: error getting channel.\n");
202 } 202 }
203 203
204 if (assoc_req->channel == priv->curbssparams.channel) 204 if (assoc_req->channel == priv->curbssparams.channel)
@@ -215,14 +215,14 @@ static int assoc_helper_channel(struct lbs_private *priv,
215 215
216 ret = lbs_set_channel(priv, assoc_req->channel); 216 ret = lbs_set_channel(priv, assoc_req->channel);
217 if (ret < 0) 217 if (ret < 0)
218 lbs_deb_assoc("ASSOC: channel: error setting channel."); 218 lbs_deb_assoc("ASSOC: channel: error setting channel.\n");
219 219
220 /* FIXME: shouldn't need to grab the channel _again_ after setting 220 /* FIXME: shouldn't need to grab the channel _again_ after setting
221 * it since the firmware is supposed to return the new channel, but 221 * it since the firmware is supposed to return the new channel, but
222 * whatever... */ 222 * whatever... */
223 ret = update_channel(priv); 223 ret = update_channel(priv);
224 if (ret < 0) 224 if (ret < 0)
225 lbs_deb_assoc("ASSOC: channel: error getting channel."); 225 lbs_deb_assoc("ASSOC: channel: error getting channel.\n");
226 226
227 if (assoc_req->channel != priv->curbssparams.channel) { 227 if (assoc_req->channel != priv->curbssparams.channel) {
228 lbs_deb_assoc("ASSOC: channel: failed to update channel to %d\n", 228 lbs_deb_assoc("ASSOC: channel: failed to update channel to %d\n",
@@ -240,7 +240,7 @@ static int assoc_helper_channel(struct lbs_private *priv,
240 } 240 }
241 241
242 /* Must restart/rejoin adhoc networks after channel change */ 242 /* Must restart/rejoin adhoc networks after channel change */
243 set_bit(ASSOC_FLAG_SSID, &assoc_req->flags); 243 set_bit(ASSOC_FLAG_SSID, &assoc_req->flags);
244 244
245 restore_mesh: 245 restore_mesh:
246 if (priv->mesh_dev) 246 if (priv->mesh_dev)
@@ -334,7 +334,7 @@ static int assoc_helper_secinfo(struct lbs_private *priv,
334 CMD_OPTION_WAITFORRSP, 334 CMD_OPTION_WAITFORRSP,
335 0, &rsn); 335 0, &rsn);
336 if (ret) { 336 if (ret) {
337 lbs_deb_assoc("Failed to get RSN status: %d", ret); 337 lbs_deb_assoc("Failed to get RSN status: %d\n", ret);
338 goto out; 338 goto out;
339 } 339 }
340 340
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 5ddb46a477a4..8d8f9d9ba192 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -222,7 +222,7 @@ static int lbs_cmd_802_11_set_wep(struct lbs_private *priv,
222 int i; 222 int i;
223 223
224 if (!assoc_req) { 224 if (!assoc_req) {
225 lbs_deb_cmd("Invalid association request!"); 225 lbs_deb_cmd("Invalid association request!\n");
226 ret = -1; 226 ret = -1;
227 goto done; 227 goto done;
228 } 228 }
@@ -2088,17 +2088,17 @@ void lbs_ps_confirm_sleep(struct lbs_private *priv, u16 psmode)
2088 2088
2089 if (priv->dnld_sent) { 2089 if (priv->dnld_sent) {
2090 allowed = 0; 2090 allowed = 0;
2091 lbs_deb_host("dnld_sent was set"); 2091 lbs_deb_host("dnld_sent was set\n");
2092 } 2092 }
2093 2093
2094 spin_lock_irqsave(&priv->driver_lock, flags); 2094 spin_lock_irqsave(&priv->driver_lock, flags);
2095 if (priv->cur_cmd) { 2095 if (priv->cur_cmd) {
2096 allowed = 0; 2096 allowed = 0;
2097 lbs_deb_host("cur_cmd was set"); 2097 lbs_deb_host("cur_cmd was set\n");
2098 } 2098 }
2099 if (priv->intcounter > 0) { 2099 if (priv->intcounter > 0) {
2100 allowed = 0; 2100 allowed = 0;
2101 lbs_deb_host("intcounter %d", priv->intcounter); 2101 lbs_deb_host("intcounter %d\n", priv->intcounter);
2102 } 2102 }
2103 spin_unlock_irqrestore(&priv->driver_lock, flags); 2103 spin_unlock_irqrestore(&priv->driver_lock, flags);
2104 2104
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index 6b8ac62e6f9a..3f8b83cc0d22 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -220,7 +220,7 @@ static int if_usb_probe(struct usb_interface *intf,
220 /* Upload firmware */ 220 /* Upload firmware */
221 cardp->rinfo.cardp = cardp; 221 cardp->rinfo.cardp = cardp;
222 if (if_usb_prog_firmware(cardp)) { 222 if (if_usb_prog_firmware(cardp)) {
223 lbs_deb_usbd(&udev->dev, "FW upload failed"); 223 lbs_deb_usbd(&udev->dev, "FW upload failed\n");
224 goto err_prog_firmware; 224 goto err_prog_firmware;
225 } 225 }
226 226