tpm_nsc: Fix bug when loading multiple TPM drivers

This patch fixes kernel bugzilla 34572.

https://bugzilla.kernel.org/show_bug.cgi?id=34572

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Reported-by: Witold Baryluk <baryluk@smp.if.uj.edu.pl>
Tested-by: Witold Baryluk <baryluk@smp.if.uj.edu.pl>
Signed-off-by: James Morris <jmorris@namei.org>

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/char/tpm/tpm_nsc.c b/drivers/char/tpm/tpm_nsc.c
index a605cb7dd898..82facc9104c7 100644
--- a/drivers/char/tpm/tpm_nsc.c
+++ b/drivers/char/tpm/tpm_nsc.c
@@ -330,12 +330,12 @@ static int __init init_nsc(void)
         pdev->dev.driver = &nsc_drv.driver;
         pdev->dev.release = tpm_nsc_remove;
 
-        if ((rc = platform_device_register(pdev)) < 0)
-                goto err_free_dev;
+        if ((rc = platform_device_add(pdev)) < 0)
+                goto err_put_dev;
 
         if (request_region(base, 2, "tpm_nsc0") == NULL ) {
                 rc = -EBUSY;
-                goto err_unreg_dev;
+                goto err_del_dev;
         }
 
         if (!(chip = tpm_register_hardware(&pdev->dev, &tpm_nsc))) {
@@ -382,10 +382,10 @@ static int __init init_nsc(void)
 
 err_rel_reg:
         release_region(base, 2);
-err_unreg_dev:
-        platform_device_unregister(pdev);
-err_free_dev:
-        kfree(pdev);
+err_del_dev:
+        platform_device_del(pdev);
+err_put_dev:
+        platform_device_put(pdev);
 err_unreg_drv:
         platform_driver_unregister(&nsc_drv);
         return rc;