[2.6.26 patch] fix the request_firmware() dummy

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Andrew Morton <akpm@...>, Linus Torvalds <torvalds@...>, James Bottomley <James.Bottomley@...>
Cc: Toralf <toralf.foerster@...>, Randy Dunlap <rdunlap@...>, <linux-kernel@...>
Date: Sunday, June 22, 2008 - 12:29 pm

From: James Bottomley <James.Bottomley@HansenPartnership.com>


There's a slight fault in the stub logic.  It fails for FW_LOADER=m and
the user =y.

This should fix it.

This patch fixes the following 2.6.26-rc regression:
  http://bugzilla.kernel.org/show_bug.cgi?id=10730

Reported-by: Toralf Förster <toralf.foerster@gmx.de>
Signed-off-by: Adrian Bunk <bunk@kernel.org>

---

@James:
Please complain if you consider my forwarding of your patch 
inappropriate.

diff --git a/include/linux/firmware.h b/include/linux/firmware.h
index 4d10c73..6c7eff2 100644
--- a/include/linux/firmware.h
+++ b/include/linux/firmware.h
@@ -13,7 +13,7 @@ struct firmware {
 
 struct device;
 
-#if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE)
+#if defined(CONFIG_FW_LOADER) || (defined(CONFIG_FW_LOADER_MODULE) && defined(MODULE))
 int request_firmware(const struct firmware **fw, const char *name,
 		     struct device *device);
 int request_firmware_nowait(


--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[2.6.26 patch] fix the request_firmware() dummy, Adrian Bunk, (Sun Jun 22, 12:29 pm)