aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorJesper Juhl <jesper.juhl@gmail.com>2007-10-18 03:06:23 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-18 14:37:26 -0700
commitd941ea7d496db914205c3872942fd1ff0e7dccef (patch)
treeb35ec0bf04c09950c756eaf194ef75cd5abf9c04 /drivers/char
parent65f76a82ec7a0374fad85211535330e203740475 (diff)
downloadkernel_samsung_smdk4412-d941ea7d496db914205c3872942fd1ff0e7dccef.zip
kernel_samsung_smdk4412-d941ea7d496db914205c3872942fd1ff0e7dccef.tar.gz
kernel_samsung_smdk4412-d941ea7d496db914205c3872942fd1ff0e7dccef.tar.bz2
Cyclades: Avoid label defined but not used warning
CC drivers/char/cyclades.o drivers/char/cyclades.c: In function 'cy_init': drivers/char/cyclades.c:5488: warning: label 'err_unr' defined but not used Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Acked-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/cyclades.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index 0634dd1..d15234c 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -5362,13 +5362,13 @@ static int __init cy_init(void)
#ifdef CONFIG_PCI
/* look for pci boards */
retval = pci_register_driver(&cy_pci_driver);
- if (retval && !nboards)
- goto err_unr;
+ if (retval && !nboards) {
+ tty_unregister_driver(cy_serial_driver);
+ goto err_frtty;
+ }
#endif
return 0;
-err_unr:
- tty_unregister_driver(cy_serial_driver);
err_frtty:
put_tty_driver(cy_serial_driver);
err: