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 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
[pandora-kernel.git]
/
drivers
/
sbus
/
char
/
vfc_dev.c
diff --git
a/drivers/sbus/char/vfc_dev.c
b/drivers/sbus/char/vfc_dev.c
index
55b2b31
..
2722af5
100644
(file)
--- a/
drivers/sbus/char/vfc_dev.c
+++ b/
drivers/sbus/char/vfc_dev.c
@@
-610,7
+610,7
@@
static int vfc_mmap(struct file *file, struct vm_area_struct *vma)
unsigned int map_size, ret, map_offset;
struct vfc_dev *dev;
- dev = vfc_get_dev_ptr(iminor(file->f_dentry->d_inode));
+ dev = vfc_get_dev_ptr(iminor(file->f_
path.
dentry->d_inode));
if(dev == NULL)
return -ENODEV;