ath9k: propagate ieee80211_alloc_hw() failure
authorLuis R. Rodriguez <lrodriguez@atheros.com>
Wed, 2 Sep 2009 23:34:57 +0000 (16:34 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 8 Sep 2009 20:31:04 +0000 (16:31 -0400)
The -ENOMEM was never being passed on failure.
While at it use dev_err() as ahb does upon failure.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/pci.c

index 685a8cebb46813f5b9a974a524178f690ff7b0d2..17862ccc34003d06368d7da81efa6e36b30ab28c 100644 (file)
@@ -160,8 +160,9 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
        hw = ieee80211_alloc_hw(sizeof(struct ath_wiphy) +
                                sizeof(struct ath_softc), &ath9k_ops);
-       if (hw == NULL) {
-               printk(KERN_ERR "ath_pci: no memory for ieee80211_hw\n");
+       if (!hw) {
+               dev_err(&pdev->dev, "no memory for ieee80211_hw\n");
+               ret = -ENOMEM;
                goto bad2;
        }