From bf904eeeb94222a442de40c2fd6393cdeca999c9 Mon Sep 17 00:00:00 2001
From: Stefan Berger <stefanb@linux.vnet.ibm.com>
Date: Fri, 22 Jul 2011 17:39:20 -0400
Subject: [PATCH] --- yaml --- r: 260959 b: refs/heads/master c:
 29412f0f6a19e34336368f13eab848091c343952 h: refs/heads/master i:   260957:
 8916c2551ef056739f57cc5ee3a28bce39c2ec94   260955:
 230893699ab990b855dd60d3d1b20dd6a69e8f36   260951:
 5c636bc65cba5a0f2511bde7c7da7083f81a1583   260943:
 68cbcd1a4dcc779e74075067c817a4c63010f7eb   260927:
 bd72944a6e4dcc2c64be52a29514e0931ae57ca3 v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/char/tpm/tpm_nsc.c | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index c55e37ee74bd..035efe2b6678 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 968543100a75bef892f52eb86e92e83b3b7bc581
+refs/heads/master: 29412f0f6a19e34336368f13eab848091c343952
diff --git a/trunk/drivers/char/tpm/tpm_nsc.c b/trunk/drivers/char/tpm/tpm_nsc.c
index a605cb7dd898..82facc9104c7 100644
--- a/trunk/drivers/char/tpm/tpm_nsc.c
+++ b/trunk/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;