Use a common error path for the failure.

Signed-off-by: Sudip Mukherjee <sudip.mukher...@codethink.co.uk>
---
 drivers/pcmcia/m32r_pcc.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/drivers/pcmcia/m32r_pcc.c b/drivers/pcmcia/m32r_pcc.c
index fad4455..56bf388 100644
--- a/drivers/pcmcia/m32r_pcc.c
+++ b/drivers/pcmcia/m32r_pcc.c
@@ -689,10 +689,8 @@ static int __init init_m32r_pcc(void)
                return ret;
 
        ret = platform_device_register(&pcc_device);
-       if (ret){
-               platform_driver_unregister(&pcc_driver);
-               return ret;
-       }
+       if (ret)
+               goto unreg_driv;
 
        printk(KERN_INFO "m32r PCC probe:\n");
 
@@ -706,9 +704,8 @@ static int __init init_m32r_pcc(void)
 
        if (pcc_sockets == 0) {
                printk("socket is not found.\n");
-               platform_device_unregister(&pcc_device);
-               platform_driver_unregister(&pcc_driver);
-               return -ENODEV;
+               ret = -ENODEV;
+               goto unreg_dev;
        }
 
        /* Set up interrupt handler(s) */
@@ -734,6 +731,12 @@ static int __init init_m32r_pcc(void)
        }
 
        return 0;
+
+unreg_dev:
+       platform_device_unregister(&pcc_device);
+unreg_driv:
+       platform_driver_unregister(&pcc_driver);
+       return ret;
 } /* init_m32r_pcc */
 
 static void __exit exit_m32r_pcc(void)
-- 
1.9.1


_______________________________________________
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia

Reply via email to