projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
[powerpc.git]
/
drivers
/
sbus
/
char
/
display7seg.c
diff --git
a/drivers/sbus/char/display7seg.c
b/drivers/sbus/char/display7seg.c
index
39f5421
..
d92bc88
100644
(file)
--- a/
drivers/sbus/char/display7seg.c
+++ b/
drivers/sbus/char/display7seg.c
@@
-119,7
+119,7
@@
static long d7s_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
__u8 regs = readb(d7s_regs);
__u8 ireg = 0;
{
__u8 regs = readb(d7s_regs);
__u8 ireg = 0;
- int error = 0
+ int error = 0
;
if (D7S_MINOR != iminor(file->f_dentry->d_inode))
return -ENODEV;
if (D7S_MINOR != iminor(file->f_dentry->d_inode))
return -ENODEV;
@@
-161,7
+161,7
@@
static long d7s_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
writeb(regs, d7s_regs);
break;
};
writeb(regs, d7s_regs);
break;
};
- lock_kernel();
+
un
lock_kernel();
return error;
}
return error;
}
@@
-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;
}
}