On Mon, Nov 07, 2016 at 07:14:33AM -0500, Stefan Berger wrote:
> Only call pm_runtime_get_sync if the device has a parent. This
> change fixes a crash in the tpm_vtpm_proxy driver since that
> driver does not have a parent device.
>
> Signed-off-by: Stefan Berger <[email protected]>
Applied.
/Jarkko
> ---
> drivers/char/tpm/tpm-interface.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm-interface.c
> b/drivers/char/tpm/tpm-interface.c
> index ef0fcdb..a2688ac 100644
> --- a/drivers/char/tpm/tpm-interface.c
> +++ b/drivers/char/tpm/tpm-interface.c
> @@ -357,7 +357,8 @@ ssize_t tpm_transmit(struct tpm_chip *chip, const u8
> *buf, size_t bufsiz,
> if (!(flags & TPM_TRANSMIT_UNLOCKED))
> mutex_lock(&chip->tpm_mutex);
>
> - pm_runtime_get_sync(chip->dev.parent);
> + if (chip->dev.parent)
> + pm_runtime_get_sync(chip->dev.parent);
>
> rc = chip->ops->send(chip, (u8 *) buf, count);
> if (rc < 0) {
> @@ -400,7 +401,8 @@ ssize_t tpm_transmit(struct tpm_chip *chip, const u8
> *buf, size_t bufsiz,
> dev_err(&chip->dev,
> "tpm_transmit: tpm_recv: error %zd\n", rc);
> out:
> - pm_runtime_put_sync(chip->dev.parent);
> + if (chip->dev.parent)
> + pm_runtime_put_sync(chip->dev.parent);
>
> if (!(flags & TPM_TRANSMIT_UNLOCKED))
> mutex_unlock(&chip->tpm_mutex);
> --
> 2.4.3
>
------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
_______________________________________________
tpmdd-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tpmdd-devel
