diff options
author | David Rientjes <rientjes@google.com> | 2007-09-27 13:41:16 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-10-12 15:03:17 -0700 |
commit | cd68602f36ceb65b24a9abcae10ca04a933c07fd (patch) | |
tree | d975bd8a82ce1518a79284f73eec416026dc41a9 /drivers/pci | |
parent | 7f785763660e75c9eddaddea3d618696af4ae3a2 (diff) | |
download | op-kernel-dev-cd68602f36ceb65b24a9abcae10ca04a933c07fd.zip op-kernel-dev-cd68602f36ceb65b24a9abcae10ca04a933c07fd.tar.gz |
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>
Diffstat (limited to 'drivers/pci')
-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 90adc62..73714db 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 */ if (capable(CAP_SYS_ADMIN)) - size = dev->cfg_size; + size = dp->size; else if (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) size = 128; else @@ -133,7 +133,7 @@ proc_bus_pci_write(struct file *file, const char __user *buf, size_t nbytes, lof const struct proc_dir_entry *dp = PDE(ino); struct pci_dev *dev = dp->data; int pos = *ppos; - int size = dev->cfg_size; + int size = dp->size; int cnt; if (pos >= size) |