---

yaml --- r: 156319 b: refs/heads/master c: 2a21f86 h: refs/heads/master i: 156317: 179c22a 156315: a5e921f 156311: 10538a8 156303: ce0111c 156287: 9f22bc4 v: v3
git-mirror · Jul 27, 2009 · d18afc0 · d18afc0
1 parent 22572d6
commit d18afc0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45f5fa32b130b2a59f9b726be45ce7fa73fb834c
+refs/heads/master: 2a21f86917f7a9fe13b180e895a816871a234dee
diff --git a/trunk/drivers/net/wireless/iwmc3200wifi/netdev.c b/trunk/drivers/net/wireless/iwmc3200wifi/netdev.c
@@ -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;