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

Commit 72c91ce8 authored by Jarkko Sakkinen's avatar Jarkko Sakkinen
Browse files

tpm: fix the rollback in tpm_chip_register() 



Fixed the rollback and gave more self-documenting names for the
functions.

Fixes: d972b052 ("tpm: fix call order in tpm-chip.c")
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
cc: stable@vger.kernel.org
Reviewed-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
parent 1bd047be

drivers/char/tpm/tpm-chip.c

+5 −5
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ struct tpm_chip *tpmm_chip_alloc(struct device *dev, 
}

EXPORT_SYMBOL_GPL(tpmm_chip_alloc);



static int tpm_dev_add_device(struct tpm_chip *chip)

static int tpm_add_char_device(struct tpm_chip *chip)

{

	int rc;
@@ -151,7 +151,6 @@ static int tpm_dev_add_device(struct tpm_chip *chip) 
			chip->devname, MAJOR(chip->dev.devt),

			MINOR(chip->dev.devt), rc);



		device_unregister(&chip->dev);

		return rc;

	}
@@ -162,13 +161,14 @@ static int tpm_dev_add_device(struct tpm_chip *chip) 
			chip->devname, MAJOR(chip->dev.devt),

			MINOR(chip->dev.devt), rc);



		cdev_del(&chip->cdev);

		return rc;

	}



	return rc;

}



static void tpm_dev_del_device(struct tpm_chip *chip)

static void tpm_del_char_device(struct tpm_chip *chip)

{

	cdev_del(&chip->cdev);

	device_unregister(&chip->dev);
@@ -222,7 +222,7 @@ int tpm_chip_register(struct tpm_chip *chip) 


	tpm_add_ppi(chip);



	rc = tpm_dev_add_device(chip);

	rc = tpm_add_char_device(chip);

	if (rc)

		goto out_err;
@@ -274,6 +274,6 @@ void tpm_chip_unregister(struct tpm_chip *chip) 
		sysfs_remove_link(&chip->pdev->kobj, "ppi");



	tpm1_chip_unregister(chip);

	tpm_dev_del_device(chip);

	tpm_del_char_device(chip);

}

EXPORT_SYMBOL_GPL(tpm_chip_unregister);