Add missing unregister tis_drv after register pdev fail

Signed-off-by: Libo Chen <libo.c...@huawei.com>
---
 drivers/char/tpm/tpm_tis.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index 8a41b6b..d5b0af4 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -884,8 +884,11 @@ 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);
+       pdev = platform_device_register_simple("tpm_tis", -1, NULL, 0);
+       if (IS_ERR(pdev) {
+           platform_driver_unregister(&tis_drv);
+           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);
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to