On Mon, 25 Sep 2006 14:13:01 +0530 Amol Lad <[email protected]> wrote:
>
> diff -uprN -X linux-2.6.18-orig/Documentation/dontdiff linux-2.6.18-orig/arch/i386/kernel/apm.c linux-2.6.18/arch/i386/kernel/apm.c
> --- linux-2.6.18-orig/arch/i386/kernel/apm.c 2006-09-21 10:15:25.000000000 +0530
> +++ linux-2.6.18/arch/i386/kernel/apm.c 2006-09-25 13:59:53.000000000 +0530
> @@ -2246,6 +2246,12 @@ static int __init apm_init(void)
> return -ENODEV;
> }
>
> + ret = misc_register(&apm_device);
> + if (ret != 0) {
> + printk(KERN_ERR "apm: cannot register misc device.\n");
> + return ret;
> + }
> +
NAK. (This has been NAKed at least twice - I guess we need to add a
comment - see patch below) The apm module can still do useful work even
if the misc_register() fails.
> if (allow_ints)
> apm_info.allow_ints = 1;
> if (broken_psr)
> @@ -2282,17 +2288,20 @@ static int __init apm_init(void)
>
> if (apm_info.disabled) {
> printk(KERN_NOTICE "apm: disabled on user request.\n");
> - return -ENODEV;
> + ret = -ENODEV;
> + goto out_misc;
> }
> if ((num_online_cpus() > 1) && !power_off && !smp) {
> printk(KERN_NOTICE "apm: disabled - APM is not SMP safe.\n");
> apm_info.disabled = 1;
> - return -ENODEV;
> + ret = -ENODEV;
> + goto out_misc;
> }
> if (PM_IS_ACTIVE()) {
> printk(KERN_NOTICE "apm: overridden by ACPI.\n");
> apm_info.disabled = 1;
> - return -ENODEV;
> + ret = -ENODEV;
> + goto out_misc;
> }
> #ifdef CONFIG_PM_LEGACY
> pm_active = 1;
> @@ -2339,7 +2348,8 @@ static int __init apm_init(void)
> ret = kernel_thread(apm, NULL, CLONE_KERNEL | SIGCHLD);
> if (ret < 0) {
> printk(KERN_ERR "apm: disabled - Unable to start kernel thread.\n");
> - return -ENOMEM;
> + ret = -ENOMEM;
> + goto out_misc;
> }
>
> if (num_online_cpus() > 1 && !smp ) {
> @@ -2348,8 +2358,6 @@ static int __init apm_init(void)
> return 0;
> }
>
> - misc_register(&apm_device);
> -
> if (HZ != 100)
> idle_period = (idle_period * HZ) / 100;
> if (idle_threshold < 100) {
> @@ -2359,6 +2367,9 @@ static int __init apm_init(void)
> }
>
> return 0;
> +out_misc:
> + misc_deregister(&apm_device);
> + return ret;
> }
So the rest is unnecessary as well ...
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
Note that we don't need to check the misc_register() return value in apm.c
Signed-off-by: Stephen Rothwell <[email protected]>
diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c
index 8591f2f..b74ebf1 100644
--- a/arch/i386/kernel/apm.c
+++ b/arch/i386/kernel/apm.c
@@ -2348,6 +2348,11 @@ #endif
return 0;
}
+ /*
+ * We don't check the return value of misc_register() because
+ * the driver can still do very useful work even without the
+ * user mode access provided by the misc device.
+ */
misc_register(&apm_device);
if (HZ != 100)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
