From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Mon, 4 Jan 2010 20:53:54 +0000 (+0100)
Subject: mwl8k: bail out if there is no AP firmware image support for this chip
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=91942230689c1758685499e82e53769d5e7f32eb;p=mv-sheeva.git

mwl8k: bail out if there is no AP firmware image support for this chip

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index 9545ff8d642..bfaa7911b33 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/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;