mwl8k: bail out if there is no AP firmware image support for this chip
authorLennert Buytenhek <buytenh@wantstofly.org>
Mon, 4 Jan 2010 20:53:54 +0000 (21:53 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 5 Jan 2010 22:13:20 +0000 (17:13 -0500)
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/mwl8k.c

index 9545ff8d6422e56adbe6452fe2bd182e7af89da9..bfaa7911b3367f2e695099ac33a5fd5719911035 100644 (file)
@@ -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;