applied.
thanks,
-len
On Tuesday 15 August 2006 01:37, akpm@xxxxxxxx wrote:
> From: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
>
> Check and handle kset_register() and kobject_register() init errors.
>
> Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
> Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
> ---
>
> drivers/acpi/scan.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff -puN drivers/acpi/scan.c~acpi-scan-handle-kset-kobject-errors drivers/acpi/scan.c
> --- a/drivers/acpi/scan.c~acpi-scan-handle-kset-kobject-errors
> +++ a/drivers/acpi/scan.c
> @@ -4,6 +4,7 @@
>
> #include <linux/module.h>
> #include <linux/init.h>
> +#include <linux/kernel.h>
> #include <linux/acpi.h>
>
> #include <acpi/acpi_drivers.h>
> @@ -113,6 +114,8 @@ static struct kset acpi_namespace_kset =
> static void acpi_device_register(struct acpi_device *device,
> struct acpi_device *parent)
> {
> + int err;
> +
> /*
> * Linkage
> * -------
> @@ -138,7 +141,10 @@ static void acpi_device_register(struct
> device->kobj.parent = &parent->kobj;
> device->kobj.ktype = &ktype_acpi_ns;
> device->kobj.kset = &acpi_namespace_kset;
> - kobject_register(&device->kobj);
> + err = kobject_register(&device->kobj);
> + if (err < 0)
> + printk(KERN_WARNING "%s: kobject_register error: %d\n",
> + __FUNCTION__, err);
> create_sysfs_device_files(device);
> }
>
> @@ -1450,7 +1456,9 @@ static int __init acpi_scan_init(void)
> if (acpi_disabled)
> return 0;
>
> - kset_register(&acpi_namespace_kset);
> + result = kset_register(&acpi_namespace_kset);
> + if (result < 0)
> + printk(KERN_ERR PREFIX "kset_register error: %d\n", result);
>
> result = bus_register(&acpi_bus_type);
> if (result) {
> _
> -
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
