Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29412f0f authored by Stefan Berger's avatar Stefan Berger Committed by James Morris
Browse files

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: default avatarStefan Berger <stefanb@linux.vnet.ibm.com>
Reported-by: default avatarWitold Baryluk <baryluk@smp.if.uj.edu.pl>
Tested-by: default avatarWitold Baryluk <baryluk@smp.if.uj.edu.pl>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 96854310

drivers/char/tpm/tpm_nsc.c

+7 −7
Original line number Diff line number Diff line
@@ -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;