[patch 05/14] acpi: handle firmware_register init errors

[patch 05/14] acpi: handle firmware_register init errors

[akpm]

From: Randy Dunlap <rdunlap@xenotime.net>

Check and handle init errors.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Cc: Greg KH <greg@kroah.com>
Cc: "Brown, Len" <len.brown@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/acpi/bus.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff -puN drivers/acpi/bus.c~acpi-handle-firmware_register-init-errors drivers/acpi/bus.c
--- a/drivers/acpi/bus.c~acpi-handle-firmware_register-init-errors
+++ a/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();
 
_

Re: [patch 05/14] acpi: handle firmware_register init errors

[Len Brown]

Applied.

Looking forward to removing this call to firmware_register() completely soon.

thanks,
-Len


On Tuesday 15 August 2006 01:37, akpm@osdl.org wrote:
> From: Randy Dunlap <rdunlap@xenotime.net>
> 
> Check and handle init errors.
> 
> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
> Cc: Greg KH <greg@kroah.com>
> Cc: "Brown, Len" <len.brown@intel.com>
> Signed-off-by: Andrew Morton <akpm@osdl.org>
> ---
> 
>  drivers/acpi/bus.c |    6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff -puN drivers/acpi/bus.c~acpi-handle-firmware_register-init-errors drivers/acpi/bus.c
> --- a/drivers/acpi/bus.c~acpi-handle-firmware_register-init-errors
> +++ a/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();
>  
> _
> -
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>