summaryrefslogtreecommitdiff
path: root/drivers/pci/pci-sysfs.c
diff options
context:
space:
mode:
authorNeil Brown <neilb@notabene.brown>2008-07-08 04:11:50 +0400
committerNeil Brown <neilb@notabene.brown>2008-07-08 04:11:50 +0400
commit5b1a4bf220a8f6f2650fdfdfebfda0f22f674d97 (patch)
treea1f22225aace571661c29e59ebd024bc4619e054 /drivers/pci/pci-sysfs.c
parent1fe797e67fb07d605b82300934d0de67068a0aca (diff)
parentb7279469d66b55119784b8b9529c99c1955fe747 (diff)
downloadlinux-5b1a4bf220a8f6f2650fdfdfebfda0f22f674d97.tar.xz
Merge branch 'master' into for-next
Diffstat (limited to 'drivers/pci/pci-sysfs.c')
-rw-r--r--drivers/pci/pci-sysfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 6f3c7446c329..9c718583a237 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -736,9 +736,9 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
attr = kzalloc(sizeof(*attr), GFP_ATOMIC);
if (attr) {
pdev->vpd->attr = attr;
- attr->size = pdev->vpd->ops->get_size(pdev);
+ attr->size = pdev->vpd->len;
attr->attr.name = "vpd";
- attr->attr.mode = S_IRUGO | S_IWUSR;
+ attr->attr.mode = S_IRUSR | S_IWUSR;
attr->read = pci_read_vpd;
attr->write = pci_write_vpd;
retval = sysfs_create_bin_file(&pdev->dev.kobj, attr);