diff options
| author | Joerg Roedel <jroedel@suse.de> | 2017-02-28 13:57:18 +0100 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2017-02-28 15:48:23 +0100 |
| commit | b7a42b9d38063e58cdf201c575da75943f71051e (patch) | |
| tree | fef44bb620a0a59c7de196a26f04b14df33c0ca0 /drivers/iommu/amd_iommu_init.c | |
| parent | a7fdb6e648fb10a4174483b5fc4dac9c25bd2093 (diff) | |
| download | linux-stable-b7a42b9d38063e58cdf201c575da75943f71051e.tar.gz linux-stable-b7a42b9d38063e58cdf201c575da75943f71051e.tar.bz2 linux-stable-b7a42b9d38063e58cdf201c575da75943f71051e.zip | |
iommu/amd: Fix crash when accessing AMD-Vi sysfs entries
The link between the iommu sysfs-device and the struct
amd_iommu is no longer stored as driver-data. Update the
code to the new correct way of getting from device to
amd_iommu.
Reported-by: Dave Jones <davej@codemonkey.org.uk>
Fixes: 39ab9555c241 ('iommu: Add sysfs bindings for struct iommu_device')
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu/amd_iommu_init.c')
| -rw-r--r-- | drivers/iommu/amd_iommu_init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index 04cdac7ab3e3..6130278c5d71 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -1507,7 +1507,7 @@ static ssize_t amd_iommu_show_cap(struct device *dev, struct device_attribute *attr, char *buf) { - struct amd_iommu *iommu = dev_get_drvdata(dev); + struct amd_iommu *iommu = dev_to_amd_iommu(dev); return sprintf(buf, "%x\n", iommu->cap); } static DEVICE_ATTR(cap, S_IRUGO, amd_iommu_show_cap, NULL); @@ -1516,7 +1516,7 @@ static ssize_t amd_iommu_show_features(struct device *dev, struct device_attribute *attr, char *buf) { - struct amd_iommu *iommu = dev_get_drvdata(dev); + struct amd_iommu *iommu = dev_to_amd_iommu(dev); return sprintf(buf, "%llx\n", iommu->features); } static DEVICE_ATTR(features, S_IRUGO, amd_iommu_show_features, NULL); |