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

Commit 819e3601 authored by Winkler, Tomas's avatar Winkler, Tomas Committed by Greg Kroah-Hartman
Browse files

tmp: use pdev for parent device in tpm_chip_alloc 



commit 2998b02b2fb58f36ccbc318b00513174e9947d8e upstream.

The tpm stack uses pdev name convention for the parent device.
Fix that also in tpm_chip_alloc().

Fixes: 3897cd9c ("tpm: Split out the devm stuff from tpmm_chip_alloc")'
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 326f9b0a

drivers/char/tpm/tpm-chip.c

+4 −4
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static void tpm_dev_release(struct device *dev) 
 * Allocates a new struct tpm_chip instance and assigns a free

 * device number for it. Must be paired with put_device(&chip->dev).

 */

struct tpm_chip *tpm_chip_alloc(struct device *dev,

struct tpm_chip *tpm_chip_alloc(struct device *pdev,

				const struct tpm_class_ops *ops)

{

	struct tpm_chip *chip;
@@ -159,7 +159,7 @@ struct tpm_chip *tpm_chip_alloc(struct device *dev, 
	rc = idr_alloc(&dev_nums_idr, NULL, 0, TPM_NUM_DEVICES, GFP_KERNEL);

	mutex_unlock(&idr_lock);

	if (rc < 0) {

		dev_err(dev, "No available tpm device numbers\n");

		dev_err(pdev, "No available tpm device numbers\n");

		kfree(chip);

		return ERR_PTR(rc);

	}
@@ -169,7 +169,7 @@ struct tpm_chip *tpm_chip_alloc(struct device *dev, 


	chip->dev.class = tpm_class;

	chip->dev.release = tpm_dev_release;

	chip->dev.parent = dev;

	chip->dev.parent = pdev;

	chip->dev.groups = chip->groups;



	if (chip->dev_num == 0)
@@ -181,7 +181,7 @@ struct tpm_chip *tpm_chip_alloc(struct device *dev, 
	if (rc)

		goto out;



	if (!dev)

	if (!pdev)

		chip->flags |= TPM_CHIP_FLAG_VIRTUAL;



	cdev_init(&chip->cdev, &tpm_fops);