All of lore.kernel.org
 help / color / mirror / Atom feed
From: Prarit Bhargava <prarit@sgi.com>
To: linux-kernel@vger.kernel.org, vojtech@suse.cz
Subject: [PATCH][RFC]: Clean up resource allocation in i8042 driver
Date: Fri, 21 Jan 2005 10:14:46 -0500	[thread overview]
Message-ID: <41F11C66.5000707@sgi.com> (raw)

Hi,

The following patch cleans up resource allocations in the i8042 driver 
when initialization fails.

Please consider for tree application.  Patch is generated against 
current bk pull.

Thanks,

P.

Signed-off-by: Prarit Bhargava <prarit@sgi.com>

===== i8042.c 1.71 vs edited =====
--- 1.71/drivers/input/serio/i8042.c    2005-01-03 08:11:49 -05:00
+++ edited/i8042.c      2005-01-21 10:02:20 -05:00
@@ -696,7 +696,10 @@
                unsigned char param;
 
                if (i8042_command(&param, I8042_CMD_CTL_TEST)) {
-                       printk(KERN_ERR "i8042.c: i8042 controller self test timeout.\n");
+                       if (i8042_read_status() != 0xFF)
+                               printk(KERN_ERR "i8042.c: i8042 controller self test timeout.\n");
+                       else
+                               printk(KERN_ERR "i8042.c: no i8042 controller found.\n");
                        return -1;
                }
 
                }

@@ -1011,21 +1014,34 @@
        i8042_timer.function = i8042_timer_func;
 
        if (i8042_platform_init())
+       {
+               del_timer_sync(&i8042_timer);
                return -EBUSY;
+       }
 
        i8042_aux_values.irq = I8042_AUX_IRQ;
        i8042_kbd_values.irq = I8042_KBD_IRQ;
 
        if (i8042_controller_init())
+       {
+               i8042_platform_exit();
+               del_timer_sync(&i8042_timer);
                return -ENODEV;
+       }
 
        err = driver_register(&i8042_driver);
        if (err)
+       {
+               i8042_platform_exit();
+               del_timer_sync(&i8042_timer);
                return err;
+       }

        i8042_platform_device = platform_device_register_simple("i8042", -1, NULL, 0);
        if (IS_ERR(i8042_platform_device)) {
                driver_unregister(&i8042_driver);
+               i8042_platform_exit();
+               del_timer_sync(&i8042_timer);
                return PTR_ERR(i8042_platform_device);
        }




             reply	other threads:[~2005-01-21 15:15 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-01-21 15:14 Prarit Bhargava [this message]
2005-01-21 15:43 ` [PATCH][RFC]: Clean up resource allocation in i8042 driver Dmitry Torokhov
2005-01-21 16:35   ` Vojtech Pavlik
2005-01-21 16:43     ` Dmitry Torokhov
2005-01-21 16:47     ` Jesse Barnes
2005-01-21 17:17       ` Prarit Bhargava
2005-02-14 16:32         ` Prarit Bhargava
2005-02-14 22:46           ` Dmitry Torokhov
2005-02-15  7:21           ` Vojtech Pavlik
2005-01-21 19:26 ` Dave Jones
2005-01-21 21:47   ` Kyle Moffett

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=41F11C66.5000707@sgi.com \
    --to=prarit@sgi.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=vojtech@suse.cz \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.