Pull ec into test branch

[linux-2.6] / drivers / sbus / char / display7seg.c

diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c
index 39f54213a6d5545b0b0ca53c851998c3ded071c0..a4909e0c7f83877d435869735fa8ecffd30d3808 100644 (file)
--- a/drivers/sbus/char/display7seg.c
+++ b/drivers/sbus/char/display7seg.c
@@ -119,9 +119,9 @@ static long d7s_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
        __u8 regs = readb(d7s_regs);
        __u8 ireg = 0;
-       int error = 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();
@@ -161,7 +161,7 @@ static long d7s_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                writeb(regs, d7s_regs);
                break;
        };
-       lock_kernel();
+       unlock_kernel();
 
        return error;
 }
@@ -184,7 +184,7 @@ static int __init d7s_init(void)
 
        for_each_ebus(ebus) {
                for_each_ebusdev(edev, ebus) {
-                       if (!strcmp(edev->prom_name, D7S_OBPNAME))
+                       if (!strcmp(edev->prom_node->name, D7S_OBPNAME))
                                goto ebus_done;
                }
        }