summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@xenotime.net>2006-07-12 01:47:00 -0400
committerLen Brown <len.brown@intel.com>2006-07-12 02:39:12 -0400
commitd568df84f987a9321c1f5826a6c8678ef2bb2b70 (patch)
tree5b67aaf1b2a66cf1c84a08dafff2cff8b65a1c21 /drivers/acpi
parent7c3dec0679c66ce177726802adbe2f403942fc27 (diff)
ACPI: handle firmware_register init errors
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/bus.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index b2977695e120..7b77ee146a80 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -25,6 +25,7 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/ioport.h>
+#include <linux/kernel.h>
#include <linux/list.h>
#include <linux/sched.h>
#include <linux/pm.h>
@@ -738,7 +739,10 @@ static int __init acpi_init(void)
return -ENODEV;
}
- firmware_register(&acpi_subsys);
+ result = firmware_register(&acpi_subsys);
+ if (result < 0)
+ printk(KERN_WARNING "%s: firmware_register error: %d\n",
+ __FUNCTION__, result);
result = acpi_bus_init();