From 32a5330d742e29306bc140131daa9fdf40ff555f Mon Sep 17 00:00:00 2001 From: Kylene Hall Date: Thu, 23 Jun 2005 22:01:57 -0700 Subject: [PATCH] --- yaml --- r: 3063 b: refs/heads/master c: e2fe90666a84e6a11c541424dfa9eec20cfe5fc1 h: refs/heads/master i: 3061: 388264de212529b52f4bbb8444fa1e66709c3623 3059: 4cdc120726fabfda0e29af3dd487fb2fc12e0fb9 3055: 43204a27e14909cd027cf3dcf47c30301e3ee97b v: v3 --- [refs] | 2 +- trunk/drivers/char/tpm/tpm.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1efe8837ea87..38e0eee6a17d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe3fd48384af79e7619d3c6b0a020f801ef63c3b +refs/heads/master: e2fe90666a84e6a11c541424dfa9eec20cfe5fc1 diff --git a/trunk/drivers/char/tpm/tpm.c b/trunk/drivers/char/tpm/tpm.c index f7fa3c3a51bd..39e82314d67f 100644 --- a/trunk/drivers/char/tpm/tpm.c +++ b/trunk/drivers/char/tpm/tpm.c @@ -218,7 +218,7 @@ static ssize_t show_pcrs(struct device *dev, struct device_attribute *attr, char char *str = buf; struct tpm_chip *chip = - pci_get_drvdata(container_of(dev, struct pci_dev, dev)); + pci_get_drvdata(to_pci_dev(dev)); if (chip == NULL) return -ENODEV; @@ -262,7 +262,7 @@ static ssize_t show_pubek(struct device *dev, struct device_attribute *attr, cha char *str = buf; struct tpm_chip *chip = - pci_get_drvdata(container_of(dev, struct pci_dev, dev)); + pci_get_drvdata(to_pci_dev(dev)); if (chip == NULL) return -ENODEV; @@ -344,7 +344,7 @@ static ssize_t show_caps(struct device *dev, struct device_attribute *attr, char char *str = buf; struct tpm_chip *chip = - pci_get_drvdata(container_of(dev, struct pci_dev, dev)); + pci_get_drvdata(to_pci_dev(dev)); if (chip == NULL) return -ENODEV;