From d18afc014fa9552336a5a0503e2f4ead991ef9fa Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Sat, 25 Jul 2009 15:22:59 +0300
Subject: [PATCH] --- yaml --- r: 156319 b: refs/heads/master c:
 2a21f86917f7a9fe13b180e895a816871a234dee h: refs/heads/master i:   156317:
 179c22a23a335ac0b07b56444c26049103d311ff   156315:
 a5e921fd53da9d683fbda6dec9468aa4652ae2af   156311:
 10538a817534985809df07bc0d8253114bb00327   156303:
 ce0111c322c80d8c454c5771ef7fb96ed5974ca5   156287:
 9f22bc4d29ec6b8b4c65c0be4769906b73a21829 v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/net/wireless/iwmc3200wifi/netdev.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index b43a48079442..fdef1ee1def4 100644
--- 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
index aea5ccf24ccf..bf294e41753b 100644
--- 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;