summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwl8k.c
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2010-01-04 21:53:54 +0100
committerJohn W. Linville <linville@tuxdriver.com>2010-01-05 17:13:20 -0500
commit91942230689c1758685499e82e53769d5e7f32eb (patch)
tree9be27cbee6d3fd96326bfa405322f55032a1b726 /drivers/net/wireless/mwl8k.c
parent4113f75187bfebccc54bf13c0ed09593023b53ca (diff)
downloadblackbird-op-linux-91942230689c1758685499e82e53769d5e7f32eb.tar.gz
blackbird-op-linux-91942230689c1758685499e82e53769d5e7f32eb.zip
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>
Diffstat (limited to 'drivers/net/wireless/mwl8k.c')
-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,
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;
OpenPOWER on IntegriCloud