wireless: ERR_PTR vs null
authorDan Carpenter <error27@gmail.com>
Sat, 25 Jul 2009 12:22:59 +0000 (15:22 +0300)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 27 Jul 2009 19:19:35 +0000 (15:19 -0400)
iwm_wdev_alloc() returns an ERR_PTR on failure and not null.  It also
prints its own dev_err() message so I removed that as well.

Compile tested only.  Sorry.
Found by smatch (http://repo.or.cz/w/smatch.git).

Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwmc3200wifi/netdev.c

index aea5ccf24ccf573533a48a22345aa5c464030010..bf294e41753b02917ab1bd95db1c76c780df4061 100644 (file)
@@ -106,10 +106,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;