From: Chris Wright <chrisw@osdl.org>
To: greg@kroah.com
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] class_simple clean up in lp
Date: Wed, 3 Mar 2004 19:58:32 -0800 [thread overview]
Message-ID: <20040303195832.T22989@build.pdx.osdl.net> (raw)
Error condition isn't caught on class_simple_create, and
parport_register_driver failure doesn't do proper cleanup.
===== drivers/char/lp.c 1.32 vs edited =====
--- 1.32/drivers/char/lp.c Wed Mar 3 04:45:18 2004
+++ edited/drivers/char/lp.c Wed Mar 3 19:32:56 2004
@@ -869,7 +869,7 @@
int __init lp_init (void)
{
- int i;
+ int i, err = 0;
if (parport_nr[0] == LP_PARPORT_OFF)
return 0;
@@ -900,10 +900,15 @@
devfs_mk_dir("printers");
lp_class = class_simple_create(THIS_MODULE, "printer");
+ if (IS_ERR(lp_class)) {
+ err = PTR_ERR(lp_class);
+ goto out_devfs;
+ }
if (parport_register_driver (&lp_driver)) {
printk (KERN_ERR "lp: unable to register with parport\n");
- return -EIO;
+ err = -EIO;
+ goto out_class;
}
if (!lp_count) {
@@ -915,6 +920,13 @@
}
return 0;
+
+out_class:
+ class_simple_destroy(lp_class);
+out_devfs:
+ devfs_remove("printers");
+ unregister_chrdev(LP_MAJOR, "lp");
+ return err;
}
static int __init lp_init_module (void)
next reply other threads:[~2004-03-04 3:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-03-04 3:58 Chris Wright [this message]
2004-03-11 1:29 ` Greg KH
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=20040303195832.T22989@build.pdx.osdl.net \
--to=chrisw@osdl.org \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®