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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
sbus
/
char
/
display7seg.c
diff --git
a/drivers/sbus/char/display7seg.c
b/drivers/sbus/char/display7seg.c
index
c3a51d1
..
a4909e0
100644
(file)
--- a/
drivers/sbus/char/display7seg.c
+++ b/
drivers/sbus/char/display7seg.c
@@
-121,7
+121,7
@@
static long d7s_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
__u8 ireg = 0;
int error = 0;
__u8 ireg = 0;
int error = 0;
- if (D7S_MINOR != iminor(file->f_dentry->d_inode))
+ if (D7S_MINOR != iminor(file->f_
path.
dentry->d_inode))
return -ENODEV;
lock_kernel();
return -ENODEV;
lock_kernel();
@@
-184,7
+184,7
@@
static int __init d7s_init(void)
for_each_ebus(ebus) {
for_each_ebusdev(edev, ebus) {
for_each_ebus(ebus) {
for_each_ebusdev(edev, ebus) {
- if (!strcmp(edev->prom_name, D7S_OBPNAME))
+ if (!strcmp(edev->prom_n
ode->n
ame, D7S_OBPNAME))
goto ebus_done;
}
}
goto ebus_done;
}
}