Skip to contentSkip to conversation

Patch "tmp: use pdev for parent device in tpm_chip_alloc" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message May 9, 2017

Subsystems (2)
Stable branch TPM device driver
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

tmp: use pdev for parent device in tpm_chip_alloc

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
tmp-use-pdev-for-parent-device-in-tpm_chip_alloc.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 2998b02b2fb58f36ccbc318b00513174e9947d8e Mon Sep 17 00:00:00 2001

From: "Winkler, Tomas" <[email protected]>
Date: Wed, 23 Nov 2016 12:04:13 +0200
Subject: tmp: use pdev for parent device in tpm_chip_alloc

From: Winkler, Tomas <[email protected]>

commit 2998b02b2fb58f36ccbc318b00513174e9947d8e upstream.

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

Fixes 3897cd9c8d1d ("tpm: Split out the devm stuff from tpmm_chip_alloc")'
Signed-off-by Tomas Winkler <[email protected]>
Reviewed-by Jarkko Sakkinen <[email protected]>
Tested-by Jarkko Sakkinen <[email protected]>
Signed-off-by Jarkko Sakkinen <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 drivers/char/tpm/tpm-chip.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/char/tpm/tpm-chip.c +4 -4
@@ -140,7 +140,7 @@ static void tpm_dev_release(struct devic
  * 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 d
 	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 d
 
 	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 d
 	if (rc)
 		goto out;
 
-	if (!dev)
+	if (!pdev)
 		chip->flags |= TPM_CHIP_FLAG_VIRTUAL;
 
 	cdev_init(&chip->cdev, &tpm_fops);

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/tmp-use-pdev-for-parent-device-in-tpm_chip_alloc.patch