aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/libertas/defs.h1
-rw-r--r--drivers/net/wireless/libertas/if_sdio.c6
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/libertas/defs.h b/drivers/net/wireless/libertas/defs.h
index 6388b05df4fc..e8dfde39abfc 100644
--- a/drivers/net/wireless/libertas/defs.h
+++ b/drivers/net/wireless/libertas/defs.h
@@ -265,6 +265,7 @@ static inline void lbs_deb_hex(unsigned int grp, const char *prompt, u8 *buf, in
265 265
266#define CMD_F_HOSTCMD (1 << 0) 266#define CMD_F_HOSTCMD (1 << 0)
267#define FW_CAPINFO_WPA (1 << 0) 267#define FW_CAPINFO_WPA (1 << 0)
268#define FW_CAPINFO_PS (1 << 1)
268#define FW_CAPINFO_FIRMWARE_UPGRADE (1 << 13) 269#define FW_CAPINFO_FIRMWARE_UPGRADE (1 << 13)
269#define FW_CAPINFO_BOOT2_UPGRADE (1<<14) 270#define FW_CAPINFO_BOOT2_UPGRADE (1<<14)
270#define FW_CAPINFO_PERSISTENT_CONFIG (1<<15) 271#define FW_CAPINFO_PERSISTENT_CONFIG (1<<15)
diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c
index 4519d7314f47..987836865ea5 100644
--- a/drivers/net/wireless/libertas/if_sdio.c
+++ b/drivers/net/wireless/libertas/if_sdio.c
@@ -209,6 +209,9 @@ static int if_sdio_handle_event(struct if_sdio_card *card,
209 event = sdio_readb(card->func, IF_SDIO_EVENT, &ret); 209 event = sdio_readb(card->func, IF_SDIO_EVENT, &ret);
210 if (ret) 210 if (ret)
211 goto out; 211 goto out;
212
213 /* right shift 3 bits to get the event id */
214 event >>= 3;
212 } else { 215 } else {
213 if (size < 4) { 216 if (size < 4) {
214 lbs_deb_sdio("event packet too small (%d bytes)\n", 217 lbs_deb_sdio("event packet too small (%d bytes)\n",
@@ -921,6 +924,9 @@ static int if_sdio_probe(struct sdio_func *func,
921 if (ret) 924 if (ret)
922 goto err_activate_card; 925 goto err_activate_card;
923 926
927 if (priv->fwcapinfo & FW_CAPINFO_PS)
928 priv->ps_supported = 1;
929
924out: 930out:
925 lbs_deb_leave_args(LBS_DEB_SDIO, "ret %d", ret); 931 lbs_deb_leave_args(LBS_DEB_SDIO, "ret %d", ret);
926 932