Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / drivers / net / wireless / iwmc3200wifi / netdev.c

diff --git a/drivers/net/wireless/iwmc3200wifi/netdev.c b/drivers/net/wireless/iwmc3200wifi/netdev.c
index 092d28a..93cc1b3 100644 (file)
--- a/drivers/net/wireless/iwmc3200wifi/netdev.c
+++ b/drivers/net/wireless/iwmc3200wifi/netdev.c
@@ -99,10 +99,8 @@ void *iwm_if_alloc(int sizeof_bus, struct device *dev,
        int ret = 0;
 
        wdev = iwm_wdev_alloc(sizeof_bus, dev);
-       if (!wdev) {
-               dev_err(dev, "no memory for wireless device instance\n");
-               return ERR_PTR(-ENOMEM);
-       }
+       if (IS_ERR(wdev))
+               return wdev;
 
        iwm = wdev_to_iwm(wdev);
        iwm->bus_ops = if_ops;