From a87f2958a1519949ef0dfeac9ad0dbfb70b727f0 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Tue, 7 Aug 2012 21:47:52 +0200
Subject: [PATCH] --- yaml --- r: 325659 b: refs/heads/master c:
 737586fe51e6d0031f83d781c0cb2f3abf8caada h: refs/heads/master i:   325657:
 95e3e44556025e2916e583c1b4d41461713f45d2   325655:
 867302e3b960ce42d0c3d545cad1da15d5f1cf65 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/char/pcmcia/synclink_cs.c | 41 +++++++++----------------
 2 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/[refs] b/[refs]
index 4193b53274f8..38496e281c09 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b19e2ca77ee4becadc85341bb0c1cee454dd4fd5
+refs/heads/master: 737586fe51e6d0031f83d781c0cb2f3abf8caada
diff --git a/trunk/drivers/char/pcmcia/synclink_cs.c b/trunk/drivers/char/pcmcia/synclink_cs.c
index d0cbd29ecfd7..0606586e76ab 100644
--- a/trunk/drivers/char/pcmcia/synclink_cs.c
+++ b/trunk/drivers/char/pcmcia/synclink_cs.c
@@ -2798,23 +2798,6 @@ static const struct tty_operations mgslpc_ops = {
 	.proc_fops = &mgslpc_proc_fops,
 };
 
-static void synclink_cs_cleanup(void)
-{
-	int rc;
-
-	while(mgslpc_device_list)
-		mgslpc_remove_device(mgslpc_device_list);
-
-	if (serial_driver) {
-		if ((rc = tty_unregister_driver(serial_driver)))
-			printk("%s(%d) failed to unregister tty driver err=%d\n",
-			       __FILE__,__LINE__,rc);
-		put_tty_driver(serial_driver);
-	}
-
-	pcmcia_unregister_driver(&mgslpc_driver);
-}
-
 static int __init synclink_cs_init(void)
 {
     int rc;
@@ -2830,7 +2813,7 @@ static int __init synclink_cs_init(void)
     serial_driver = alloc_tty_driver(MAX_DEVICE_COUNT);
     if (!serial_driver) {
 	    rc = -ENOMEM;
-	    goto error;
+	    goto err_pcmcia_drv;
     }
 
     /* Initialize the tty_driver structure */
@@ -2850,25 +2833,29 @@ static int __init synclink_cs_init(void)
     if ((rc = tty_register_driver(serial_driver)) < 0) {
 	    printk("%s(%d):Couldn't register serial driver\n",
 		   __FILE__,__LINE__);
-	    put_tty_driver(serial_driver);
-	    serial_driver = NULL;
-	    goto error;
+	    goto err_put_tty;
     }
 
     printk("%s %s, tty major#%d\n",
 	   driver_name, driver_version,
 	   serial_driver->major);
 
-    return 0;
-
-error:
-    synclink_cs_cleanup();
-    return rc;
+	return 0;
+err_put_tty:
+	put_tty_driver(serial_driver);
+err_pcmcia_drv:
+	pcmcia_unregister_driver(&mgslpc_driver);
+	return rc;
 }
 
 static void __exit synclink_cs_exit(void)
 {
-	synclink_cs_cleanup();
+	while (mgslpc_device_list)
+		mgslpc_remove_device(mgslpc_device_list);
+
+	tty_unregister_driver(serial_driver);
+	put_tty_driver(serial_driver);
+	pcmcia_unregister_driver(&mgslpc_driver);
 }
 
 module_init(synclink_cs_init);