On Fri, Jan 29, 2016 at 04:28:14PM -0800, Jarkko Sakkinen wrote:
> Fixed rollback and gave better names to the functions (more
> self-documenting, less confusing).
>
> Fixes: d972b0523f ("tpm: fix call order in tpm-chip.c")
> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@xxxxxxxxxxxxxxx>
> cc: stable@xxxxxxxxxxxxxxx
> drivers/char/tpm/tpm-chip.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
> index 45cc39a..1a9dcee 100644
> +++ b/drivers/char/tpm/tpm-chip.c
> @@ -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;
Yep.
Reviewed-By: Jason Gunthorpe <jgunthorpe@xxxxxxxxxxxxxxxxxxxx>
Jason
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html