tpm_tis: missing platform_driver_unregister() on error in init_tis()

Add the missing platform_driver_unregister() before return
from init_tis() in the device register error handling case.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Kent Yoder <key@linux.vnet.ibm.com>

diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index 8a41b6be23a057bd5ff033f30d7de52ac7085a38..4519cb332987bc1ac840f9d8ac26cac4be3b964b 100644 (file)
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -884,12 +884,19 @@ static int __init init_tis(void)
        rc = platform_driver_register(&tis_drv);
        if (rc < 0)
                return rc;
-       if (IS_ERR(pdev=platform_device_register_simple("tpm_tis", -1, NULL, 0)))
-               return PTR_ERR(pdev);
-       if((rc=tpm_tis_init(&pdev->dev, TIS_MEM_BASE, TIS_MEM_LEN, 0)) != 0) {
-               platform_device_unregister(pdev);
-               platform_driver_unregister(&tis_drv);
+       pdev = platform_device_register_simple("tpm_tis", -1, NULL, 0);
+       if (IS_ERR(pdev)) {
+               rc = PTR_ERR(pdev);
+               goto err_dev;
        }
+       rc = tpm_tis_init(&pdev->dev, TIS_MEM_BASE, TIS_MEM_LEN, 0);
+       if (rc)
+               goto err_init;
+       return 0;
+err_init:
+       platform_device_unregister(pdev);
+err_dev:
+       platform_driver_unregister(&tis_drv);
        return rc;
 }