git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.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
..
386e7de
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;
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;
if(dev == NULL)
return -ENODEV;
@@
-659,7
+659,7
@@
static int vfc_probe(void)
if (!cards)
return -ENODEV;
if (!cards)
return -ENODEV;
- vfc_dev_lst =
(struct vfc_dev **)
kmalloc(sizeof(struct vfc_dev *) *
+ vfc_dev_lst = kmalloc(sizeof(struct vfc_dev *) *
(cards+1),
GFP_KERNEL);
if (vfc_dev_lst == NULL)
(cards+1),
GFP_KERNEL);
if (vfc_dev_lst == NULL)