Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d941ea7d496db914205c3872942fd1ff0e7dccef
Commit:     d941ea7d496db914205c3872942fd1ff0e7dccef
Parent:     65f76a82ec7a0374fad85211535330e203740475
Author:     Jesper Juhl <[EMAIL PROTECTED]>
AuthorDate: Thu Oct 18 03:06:23 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Thu Oct 18 14:37:26 2007 -0700

    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 <[EMAIL PROTECTED]>
    Acked-by: Jiri Slaby <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 drivers/char/cyclades.c |    8 ++++----
 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:
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to