diff options
author | David Rientjes <rientjes@google.com> | 2007-09-27 16:41:16 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-10-12 18:03:17 -0400 |
commit | cd68602f36ceb65b24a9abcae10ca04a933c07fd (patch) | |
tree | d975bd8a82ce1518a79284f73eec416026dc41a9 | |
parent | 7f785763660e75c9eddaddea3d618696af4ae3a2 (diff) |
pci: use size stored in proc_dir_entry for proc bus files
On pci_proc_attach_device(), the size of the PCI configuration space is
stored in the proc_dir_entry as the size of the file. Thus, the procfs
interface to PCI devices should use it instead of the device directly.
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/pci/proc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c index 90adc62d07ff..73714db6995e 100644 --- a/drivers/pci/proc.c +++ b/drivers/pci/proc.c | |||
@@ -60,7 +60,7 @@ proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *pp | |||
60 | */ | 60 | */ |
61 | 61 | ||
62 | if (capable(CAP_SYS_ADMIN)) | 62 | if (capable(CAP_SYS_ADMIN)) |
63 | size = dev->cfg_size; | 63 | size = dp->size; |
64 | else if (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) | 64 | else if (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) |
65 | size = 128; | 65 | size = 128; |
66 | else | 66 | else |
@@ -133,7 +133,7 @@ proc_bus_pci_write(struct file *file, const char __user *buf, size_t nbytes, lof | |||
133 | const struct proc_dir_entry *dp = PDE(ino); | 133 | const struct proc_dir_entry *dp = PDE(ino); |
134 | struct pci_dev *dev = dp->data; | 134 | struct pci_dev *dev = dp->data; |
135 | int pos = *ppos; | 135 | int pos = *ppos; |
136 | int size = dev->cfg_size; | 136 | int size = dp->size; |
137 | int cnt; | 137 | int cnt; |
138 | 138 | ||
139 | if (pos >= size) | 139 | if (pos >= size) |