aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/if_cs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/libertas/if_cs.c')
-rw-r--r--drivers/net/wireless/libertas/if_cs.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c
index 58143637c737..4b5ab9a6b97b 100644
--- a/drivers/net/wireless/libertas/if_cs.c
+++ b/drivers/net/wireless/libertas/if_cs.c
@@ -647,7 +647,6 @@ static int if_cs_get_int_status(struct lbs_private *priv, u8 *ireg)
647 struct if_cs_card *card = (struct if_cs_card *)priv->card; 647 struct if_cs_card *card = (struct if_cs_card *)priv->card;
648 int ret = 0; 648 int ret = 0;
649 u16 int_cause; 649 u16 int_cause;
650 u8 *cmdbuf;
651 *ireg = 0; 650 *ireg = 0;
652 651
653 lbs_deb_enter(LBS_DEB_CS); 652 lbs_deb_enter(LBS_DEB_CS);
@@ -679,14 +678,7 @@ sbi_get_int_status_exit:
679 /* Card has a command result for us */ 678 /* Card has a command result for us */
680 if (*ireg & IF_CS_C_S_CMD_UPLD_RDY) { 679 if (*ireg & IF_CS_C_S_CMD_UPLD_RDY) {
681 spin_lock(&priv->driver_lock); 680 spin_lock(&priv->driver_lock);
682 if (!priv->cur_cmd) { 681 ret = if_cs_receive_cmdres(priv, priv->upld_buf, &priv->upld_len);
683 cmdbuf = priv->upld_buf;
684 priv->hisregcpy &= ~IF_CS_C_S_RX_UPLD_RDY;
685 } else {
686 cmdbuf = (u8 *) priv->cur_cmd->cmdbuf;
687 }
688
689 ret = if_cs_receive_cmdres(priv, cmdbuf, &priv->upld_len);
690 spin_unlock(&priv->driver_lock); 682 spin_unlock(&priv->driver_lock);
691 if (ret < 0) 683 if (ret < 0)
692 lbs_pr_err("could not receive cmd from card\n"); 684 lbs_pr_err("could not receive cmd from card\n");