* [PATCH] tpm: fix rollback when adding char dev fails
@ 2016-01-30 0:28 Jarkko Sakkinen
2016-02-02 23:17 ` [tpmdd-devel] " Jason Gunthorpe
0 siblings, 1 reply; 2+ messages in thread
From: Jarkko Sakkinen @ 2016-01-30 0:28 UTC (permalink / raw)
To: Peter Huewe; +Cc: tpmdd-devel, linux-kernel, Jarkko Sakkinen, stable
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@linux.intel.com>
cc: stable@vger.kernel.org
---
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
--- a/drivers/char/tpm/tpm-chip.c
+++ 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;
}
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);
--
2.7.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [tpmdd-devel] [PATCH] tpm: fix rollback when adding char dev fails
2016-01-30 0:28 [PATCH] tpm: fix rollback when adding char dev fails Jarkko Sakkinen
@ 2016-02-02 23:17 ` Jason Gunthorpe
0 siblings, 0 replies; 2+ messages in thread
From: Jason Gunthorpe @ 2016-02-02 23:17 UTC (permalink / raw)
To: Jarkko Sakkinen; +Cc: Peter Huewe, stable, tpmdd-devel, linux-kernel
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@linux.intel.com>
> cc: stable@vger.kernel.org
> 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@obsidianresearch.com>
Jason
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-02-02 23:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-30 0:28 [PATCH] tpm: fix rollback when adding char dev fails Jarkko Sakkinen
2016-02-02 23:17 ` [tpmdd-devel] " Jason Gunthorpe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).