From c2cd2af28bd5209ed176b2a561a252672dc7f11d Mon Sep 17 00:00:00 2001
From: Kalle Valo <Kalle.Valo@iki.fi>
Date: Sun, 28 Aug 2005 22:46:57 +0300
Subject: [PATCH] --- yaml --- r: 6799 b: refs/heads/master c:
 a8eef8a22232e64be76410100c52038b21bda7ed h: refs/heads/master i:   6797:
 a0506f3c782f6d92628ac4abef3e801db0f3fcc7   6795:
 80f148cb04050c60634d883aaeb4cbd03ee3b1ee   6791:
 052fbf4e8e441e8212112f2b3177ce807498d13b   6783:
 9ffc87e7b61804cd8fd13c521c9ba55ee75035ea v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/wireless/hostap/hostap_cs.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;