git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-forlinus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
drivers
/
pci
/
proc.c
diff --git
a/drivers/pci/proc.c
b/drivers/pci/proc.c
index
9eb4657
..
92a8857
100644
(file)
--- a/
drivers/pci/proc.c
+++ b/
drivers/pci/proc.c
@@
-25,7
+25,7
@@
proc_bus_pci_lseek(struct file *file, loff_t off, int whence)
loff_t new = -1;
struct inode *inode = file->f_dentry->d_inode;
loff_t new = -1;
struct inode *inode = file->f_dentry->d_inode;
-
down(&inode->i_sem
);
+
mutex_lock(&inode->i_mutex
);
switch (whence) {
case 0:
new = off;
switch (whence) {
case 0:
new = off;
@@
-41,7
+41,7
@@
proc_bus_pci_lseek(struct file *file, loff_t off, int whence)
new = -EINVAL;
else
file->f_pos = new;
new = -EINVAL;
else
file->f_pos = new;
-
up(&inode->i_sem
);
+
mutex_unlock(&inode->i_mutex
);
return new;
}
return new;
}
@@
-431,6
+431,7
@@
int pci_proc_detach_device(struct pci_dev *dev)
return 0;
}
return 0;
}
+#if 0
int pci_proc_attach_bus(struct pci_bus* bus)
{
struct proc_dir_entry *de = bus->procdir;
int pci_proc_attach_bus(struct pci_bus* bus)
{
struct proc_dir_entry *de = bus->procdir;
@@
-447,6
+448,7
@@
int pci_proc_attach_bus(struct pci_bus* bus)
}
return 0;
}
}
return 0;
}
+#endif /* 0 */
int pci_proc_detach_bus(struct pci_bus* bus)
{
int pci_proc_detach_bus(struct pci_bus* bus)
{
@@
-612,7
+614,6
@@
__initcall(pci_proc_init);
#ifdef CONFIG_HOTPLUG
EXPORT_SYMBOL(pci_proc_attach_device);
#ifdef CONFIG_HOTPLUG
EXPORT_SYMBOL(pci_proc_attach_device);
-EXPORT_SYMBOL(pci_proc_attach_bus);
EXPORT_SYMBOL(pci_proc_detach_bus);
#endif
EXPORT_SYMBOL(pci_proc_detach_bus);
#endif