aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2010-01-04 15:53:54 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-01-05 17:13:20 -0500
commit91942230689c1758685499e82e53769d5e7f32eb (patch)
tree9be27cbee6d3fd96326bfa405322f55032a1b726
parent4113f75187bfebccc54bf13c0ed09593023b53ca (diff)
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>
-rw-r--r--drivers/net/wireless/mwl8k.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index 9545ff8d6422..bfaa7911b336 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,
3361 mwl8k_release_firmware(priv); 3361 mwl8k_release_firmware(priv);
3362 3362
3363 3363
3364 if (priv->ap_fw) 3364 if (priv->ap_fw) {
3365 priv->rxd_ops = priv->device_info->ap_rxd_ops; 3365 priv->rxd_ops = priv->device_info->ap_rxd_ops;
3366 else 3366 if (priv->rxd_ops == NULL) {
3367 printk(KERN_ERR "%s: Driver does not have AP "
3368 "firmware image support for this hardware\n",
3369 wiphy_name(hw->wiphy));
3370 goto err_stop_firmware;
3371 }
3372 } else {
3367 priv->rxd_ops = &rxd_sta_ops; 3373 priv->rxd_ops = &rxd_sta_ops;
3374 }
3368 3375
3369 priv->sniffer_enabled = false; 3376 priv->sniffer_enabled = false;
3370 priv->wmm_enabled = false; 3377 priv->wmm_enabled = false;