diff --git a/[refs] b/[refs]
index c49ee2814fac..767b8bb3b8d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65f76a82ec7a0374fad85211535330e203740475
+refs/heads/master: d941ea7d496db914205c3872942fd1ff0e7dccef
diff --git a/trunk/drivers/char/cyclades.c b/trunk/drivers/char/cyclades.c
index 0634dd1c773a..d15234c5965e 100644
--- a/trunk/drivers/char/cyclades.c
+++ b/trunk/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: