From 3adf739132485bfc8fa5b739ff0eb8bbbb10783e Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 24 Aug 2011 15:55:30 -0700
Subject: [PATCH] --- yaml --- r: 263283 b: refs/heads/master c:
 caca9510ff4e5d842c0589110243d60927836222 h: refs/heads/master i:   263281:
 8ec16d7a8441bb4b66bb166f8010501cc571f61a   263279:
 9f4d9d8fa5160d5b56f031089e66e8a5443f7381 v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/base/firmware_class.c | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 9ce13aed92c4..f6425a949ebb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 650cf77d750153a5c1f51ae78a93f399151032d1
+refs/heads/master: caca9510ff4e5d842c0589110243d60927836222
diff --git a/trunk/drivers/base/firmware_class.c b/trunk/drivers/base/firmware_class.c
index bbb03e6f7255..06ed6b4e7df5 100644
--- a/trunk/drivers/base/firmware_class.c
+++ b/trunk/drivers/base/firmware_class.c
@@ -521,11 +521,6 @@ static int _request_firmware(const struct firmware **firmware_p,
 	if (!firmware_p)
 		return -EINVAL;
 
-	if (WARN_ON(usermodehelper_is_disabled())) {
-		dev_err(device, "firmware: %s will not be loaded\n", name);
-		return -EBUSY;
-	}
-
 	*firmware_p = firmware = kzalloc(sizeof(*firmware), GFP_KERNEL);
 	if (!firmware) {
 		dev_err(device, "%s: kmalloc(struct firmware) failed\n",
@@ -539,6 +534,12 @@ static int _request_firmware(const struct firmware **firmware_p,
 		return 0;
 	}
 
+	if (WARN_ON(usermodehelper_is_disabled())) {
+		dev_err(device, "firmware: %s will not be loaded\n", name);
+		retval = -EBUSY;
+		goto out;
+	}
+
 	if (uevent)
 		dev_dbg(device, "firmware: requesting %s\n", name);