aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCiaran McCreesh <ciaran.mccreesh@googlemail.com>2008-04-29 03:59:35 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-29 11:06:05 -0400
commit9a3be324e3d9da08219d81d6765f445a726cf962 (patch)
treee17748b7ff5a40c939713286f706bcff0e29d456
parent66e106010db689fdbdbd7ae738b115dae5f521e4 (diff)
firmware loader: printk when requesting firmware
Before requesting firmware, printk a message saying what we're requesting. This makes it easier to see what's going on, and provides an explanation for the huge silent delay that one would otherwise get after accidentally building ipw2200 as a non-module. Cc: Greg KH <greg@kroah.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/base/firmware_class.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 1fef7df8c9d6..9fd4a8534146 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -396,6 +396,8 @@ _request_firmware(const struct firmware **firmware_p, const char *name,
396 if (!firmware_p) 396 if (!firmware_p)
397 return -EINVAL; 397 return -EINVAL;
398 398
399 printk(KERN_INFO "firmware: requesting %s\n", name);
400
399 *firmware_p = firmware = kzalloc(sizeof(*firmware), GFP_KERNEL); 401 *firmware_p = firmware = kzalloc(sizeof(*firmware), GFP_KERNEL);
400 if (!firmware) { 402 if (!firmware) {
401 printk(KERN_ERR "%s: kmalloc(struct firmware) failed\n", 403 printk(KERN_ERR "%s: kmalloc(struct firmware) failed\n",