aboutsummaryrefslogtreecommitdiffstats
path: root/package/libertas/src/if_cs.c
diff options
context:
space:
mode:
authorJens Muecke <jens@nons.de>2008-01-24 03:03:04 +0000
committerJens Muecke <jens@nons.de>2008-01-24 03:03:04 +0000
commit3829f7b3f1ce44131a25f34d3c21ee33ab1ba7fa (patch)
tree12be7757f7f03efb1eeb53266dc48496b0d99b2f /package/libertas/src/if_cs.c
parent8ee2e7a4a3161b73949836276e5fd847c44f1c10 (diff)
downloadupstream-3829f7b3f1ce44131a25f34d3c21ee33ab1ba7fa.tar.gz
upstream-3829f7b3f1ce44131a25f34d3c21ee33ab1ba7fa.tar.bz2
upstream-3829f7b3f1ce44131a25f34d3c21ee33ab1ba7fa.zip
Updating libertas wireless driver to latest version.
SVN-Revision: 10235
Diffstat (limited to 'package/libertas/src/if_cs.c')
-rw-r--r--package/libertas/src/if_cs.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/package/libertas/src/if_cs.c b/package/libertas/src/if_cs.c
index 58143637c7..030dbe2593 100644
--- a/package/libertas/src/if_cs.c
+++ b/package/libertas/src/if_cs.c
@@ -243,7 +243,7 @@ static inline void if_cs_disable_ints(struct if_cs_card *card)
static irqreturn_t if_cs_interrupt(int irq, void *data)
{
- struct if_cs_card *card = data;
+ struct if_cs_card *card = (struct if_cs_card *)data;
u16 int_cause;
lbs_deb_enter(LBS_DEB_CS);
@@ -647,7 +647,6 @@ static int if_cs_get_int_status(struct lbs_private *priv, u8 *ireg)
struct if_cs_card *card = (struct if_cs_card *)priv->card;
int ret = 0;
u16 int_cause;
- u8 *cmdbuf;
*ireg = 0;
lbs_deb_enter(LBS_DEB_CS);
@@ -679,14 +678,7 @@ sbi_get_int_status_exit:
/* Card has a command result for us */
if (*ireg & IF_CS_C_S_CMD_UPLD_RDY) {
spin_lock(&priv->driver_lock);
- if (!priv->cur_cmd) {
- cmdbuf = priv->upld_buf;
- priv->hisregcpy &= ~IF_CS_C_S_RX_UPLD_RDY;
- } else {
- cmdbuf = (u8 *) priv->cur_cmd->cmdbuf;
- }
-
- ret = if_cs_receive_cmdres(priv, cmdbuf, &priv->upld_len);
+ ret = if_cs_receive_cmdres(priv, priv->upld_buf, &priv->upld_len);
spin_unlock(&priv->driver_lock);
if (ret < 0)
lbs_pr_err("could not receive cmd from card\n");