From 07e96dd50984cd42efd574e3acbdfe1f953df9f3 Mon Sep 17 00:00:00 2001
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Mon, 4 Jan 2010 21:53:54 +0100
Subject: [PATCH] --- yaml --- r: 183547 b: refs/heads/master c:
 91942230689c1758685499e82e53769d5e7f32eb h: refs/heads/master i:   183545:
 a0774046dd680be5c48494790855781335c969db   183543:
 04b2296c7c7b823660dcc0b551409b8350d8e792 v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/net/wireless/mwl8k.c | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e7b466b66752..86145629f120 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4113f75187bfebccc54bf13c0ed09593023b53ca
+refs/heads/master: 91942230689c1758685499e82e53769d5e7f32eb
diff --git a/trunk/drivers/net/wireless/mwl8k.c b/trunk/drivers/net/wireless/mwl8k.c
index 9545ff8d6422..bfaa7911b336 100644
--- a/trunk/drivers/net/wireless/mwl8k.c
+++ b/trunk/drivers/net/wireless/mwl8k.c
@@ -3361,10 +3361,17 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
 	mwl8k_release_firmware(priv);
 
 
-	if (priv->ap_fw)
+	if (priv->ap_fw) {
 		priv->rxd_ops = priv->device_info->ap_rxd_ops;
-	else
+		if (priv->rxd_ops == NULL) {
+			printk(KERN_ERR "%s: Driver does not have AP "
+			       "firmware image support for this hardware\n",
+			       wiphy_name(hw->wiphy));
+			goto err_stop_firmware;
+		}
+	} else {
 		priv->rxd_ops = &rxd_sta_ops;
+	}
 
 	priv->sniffer_enabled = false;
 	priv->wmm_enabled = false;