aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/wl1271_cmd.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_cmd.c')
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_cmd.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_cmd.c b/drivers/net/wireless/wl12xx/wl1271_cmd.c
index ceb1ca63c43a..20f3e67c8e48 100644
--- a/drivers/net/wireless/wl12xx/wl1271_cmd.c
+++ b/drivers/net/wireless/wl12xx/wl1271_cmd.c
@@ -505,7 +505,7 @@ int wl1271_cmd_configure(struct wl1271 *wl, u16 id, void *buf, size_t len)
505 return 0; 505 return 0;
506} 506}
507 507
508int wl1271_cmd_data_path(struct wl1271 *wl, u8 channel, bool enable) 508int wl1271_cmd_data_path(struct wl1271 *wl, bool enable)
509{ 509{
510 struct cmd_enabledisable_path *cmd; 510 struct cmd_enabledisable_path *cmd;
511 int ret; 511 int ret;
@@ -519,7 +519,8 @@ int wl1271_cmd_data_path(struct wl1271 *wl, u8 channel, bool enable)
519 goto out; 519 goto out;
520 } 520 }
521 521
522 cmd->channel = channel; 522 /* the channel here is only used for calibration, so hardcoded to 1 */
523 cmd->channel = 1;
523 524
524 if (enable) { 525 if (enable) {
525 cmd_rx = CMD_ENABLE_RX; 526 cmd_rx = CMD_ENABLE_RX;
@@ -532,22 +533,22 @@ int wl1271_cmd_data_path(struct wl1271 *wl, u8 channel, bool enable)
532 ret = wl1271_cmd_send(wl, cmd_rx, cmd, sizeof(*cmd), 0); 533 ret = wl1271_cmd_send(wl, cmd_rx, cmd, sizeof(*cmd), 0);
533 if (ret < 0) { 534 if (ret < 0) {
534 wl1271_error("rx %s cmd for channel %d failed", 535 wl1271_error("rx %s cmd for channel %d failed",
535 enable ? "start" : "stop", channel); 536 enable ? "start" : "stop", cmd->channel);
536 goto out; 537 goto out;
537 } 538 }
538 539
539 wl1271_debug(DEBUG_BOOT, "rx %s cmd channel %d", 540 wl1271_debug(DEBUG_BOOT, "rx %s cmd channel %d",
540 enable ? "start" : "stop", channel); 541 enable ? "start" : "stop", cmd->channel);
541 542
542 ret = wl1271_cmd_send(wl, cmd_tx, cmd, sizeof(*cmd), 0); 543 ret = wl1271_cmd_send(wl, cmd_tx, cmd, sizeof(*cmd), 0);
543 if (ret < 0) { 544 if (ret < 0) {
544 wl1271_error("tx %s cmd for channel %d failed", 545 wl1271_error("tx %s cmd for channel %d failed",
545 enable ? "start" : "stop", channel); 546 enable ? "start" : "stop", cmd->channel);
546 return ret; 547 return ret;
547 } 548 }
548 549
549 wl1271_debug(DEBUG_BOOT, "tx %s cmd channel %d", 550 wl1271_debug(DEBUG_BOOT, "tx %s cmd channel %d",
550 enable ? "start" : "stop", channel); 551 enable ? "start" : "stop", cmd->channel);
551 552
552out: 553out:
553 kfree(cmd); 554 kfree(cmd);