From patchwork Mon Jan 4 20:53:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lennert Buytenhek X-Patchwork-Id: 70721 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o04KrvPX021829 for ; Mon, 4 Jan 2010 20:53:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753709Ab0ADUx4 (ORCPT ); Mon, 4 Jan 2010 15:53:56 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753740Ab0ADUx4 (ORCPT ); Mon, 4 Jan 2010 15:53:56 -0500 Received: from fw.wantstofly.org ([80.101.37.227]:52760 "EHLO mail.wantstofly.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751125Ab0ADUx4 (ORCPT ); Mon, 4 Jan 2010 15:53:56 -0500 Received: by mail.wantstofly.org (Postfix, from userid 500) id E11BD18E20D; Mon, 4 Jan 2010 21:53:54 +0100 (CET) Date: Mon, 4 Jan 2010 21:53:54 +0100 From: Lennert Buytenhek To: linville@tuxdriver.com, linux-wireless@vger.kernel.org Subject: [PATCH 01/14] mwl8k: bail out if there is no AP firmware image support for this chip Message-ID: <20100104205354.GA1735@mail.wantstofly.org> Mime-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.4.2.2i Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index cf0671f..d3a7916 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c @@ -3363,10 +3363,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;