evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tpm: fix the rollback in tpm_chip_register()

Browse source 
commit 72c91ce8523ae5828fe5e4417ae0aaab53707a08 upstream.

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

Fixes: d972b0523f ("tpm: fix call order in tpm-chip.c")
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jarkko Sakkinen 2016-01-29 09:47:22 -08:00 • committed by Greg Kroah-Hartman
parent fa0ae4f223
commit 3e69549b48
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/char/tpm/tpm-chip.c
View file

@ -140,7 +140,7 @@ struct tpm_chip *tpmm_chip_alloc(struct device *dev,
} }
EXPORT_SYMBOL_GPL(tpmm_chip_alloc); 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; int rc;
@ -151,7 +151,6 @@ static int tpm_dev_add_device(struct tpm_chip *chip)
chip->devname, MAJOR(chip->dev.devt), chip->devname, MAJOR(chip->dev.devt),
MINOR(chip->dev.devt), rc); MINOR(chip->dev.devt), rc);
device_unregister(&chip->dev);
return rc; return rc;
} }
@ -162,13 +161,14 @@ static int tpm_dev_add_device(struct tpm_chip *chip)
chip->devname, MAJOR(chip->dev.devt), chip->devname, MAJOR(chip->dev.devt),
MINOR(chip->dev.devt), rc); MINOR(chip->dev.devt), rc);
cdev_del(&chip->cdev);
return rc; return rc;
} }
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); cdev_del(&chip->cdev);
device_unregister(&chip->dev); device_unregister(&chip->dev);
@ -222,7 +222,7 @@ int tpm_chip_register(struct tpm_chip *chip)
tpm_add_ppi(chip); tpm_add_ppi(chip);
rc = tpm_dev_add_device(chip); rc = tpm_add_char_device(chip);
if (rc) if (rc)
goto out_err; goto out_err;
@ -274,6 +274,6 @@ void tpm_chip_unregister(struct tpm_chip *chip)
sysfs_remove_link(&chip->pdev->kobj, "ppi"); sysfs_remove_link(&chip->pdev->kobj, "ppi");
tpm1_chip_unregister(chip); tpm1_chip_unregister(chip);
tpm_dev_del_device(chip); tpm_del_char_device(chip);
} }
EXPORT_SYMBOL_GPL(tpm_chip_unregister); EXPORT_SYMBOL_GPL(tpm_chip_unregister);