---

yaml
---
r: 260959
b: refs/heads/master
c: 29412f0
h: refs/heads/master
i:
  260957: 8916c25
  260955: 2308936
  260951: 5c636bc
  260943: 68cbcd1
  260927: bd72944
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 968543100a75bef892f52eb86e92e83b3b7bc581
+refs/heads/master: 29412f0f6a19e34336368f13eab848091c343952

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;