diff --git a/[refs] b/[refs]
index 56ae61dbee20..49d449387e37 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c5b90d2c84d557baed56e71729504b467ff3e5b
+refs/heads/master: a8eef8a22232e64be76410100c52038b21bda7ed
diff --git a/trunk/drivers/net/wireless/hostap/hostap_cs.c b/trunk/drivers/net/wireless/hostap/hostap_cs.c
index 491cf49042c6..e1f1eb8e484a 100644
--- a/trunk/drivers/net/wireless/hostap/hostap_cs.c
+++ b/trunk/drivers/net/wireless/hostap/hostap_cs.c
@@ -212,7 +212,7 @@ static int prism2_event(event_t event, int priority,
 static int prism2_pccard_card_present(local_info_t *local)
 {
 	struct hostap_cs_priv *hw_priv = local->hw_priv;
-	if (hw_priv->link != NULL &&
+	if (hw_priv != NULL && hw_priv->link != NULL &&
 	    ((hw_priv->link->state & (DEV_PRESENT | DEV_CONFIG)) ==
 	     (DEV_PRESENT | DEV_CONFIG)))
 		return 1;