diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2006-09-29 04:59:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-29 12:18:10 -0400 |
commit | d09d7ddf3018b4c6efa76dce72f6dec6054fa22b (patch) | |
tree | 09e28b0602f482b2fadcaecf353ffc02134485cd /drivers/char/lp.c | |
parent | 2aae4a108dab8b8bc92270335f6e4b5c146b32ae (diff) |
[PATCH] There is no devfs, there has never been a devfs, we have always been at war with...
Jon Smirl noted a couple of tty driver functions now are quite misleadingly
named with the death of devfs. A quick grep found another case in the lp
driver.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/lp.c')
-rw-r--r-- | drivers/char/lp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/lp.c b/drivers/char/lp.c index f875fda3b089..1ecea7d448f1 100644 --- a/drivers/char/lp.c +++ b/drivers/char/lp.c | |||
@@ -906,7 +906,7 @@ static int __init lp_init (void) | |||
906 | lp_class = class_create(THIS_MODULE, "printer"); | 906 | lp_class = class_create(THIS_MODULE, "printer"); |
907 | if (IS_ERR(lp_class)) { | 907 | if (IS_ERR(lp_class)) { |
908 | err = PTR_ERR(lp_class); | 908 | err = PTR_ERR(lp_class); |
909 | goto out_devfs; | 909 | goto out_reg; |
910 | } | 910 | } |
911 | 911 | ||
912 | if (parport_register_driver (&lp_driver)) { | 912 | if (parport_register_driver (&lp_driver)) { |
@@ -927,7 +927,7 @@ static int __init lp_init (void) | |||
927 | 927 | ||
928 | out_class: | 928 | out_class: |
929 | class_destroy(lp_class); | 929 | class_destroy(lp_class); |
930 | out_devfs: | 930 | out_reg: |
931 | unregister_chrdev(LP_MAJOR, "lp"); | 931 | unregister_chrdev(LP_MAJOR, "lp"); |
932 | return err; | 932 | return err; |
933 | } | 933 | } |