X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=drivers%2Fsbus%2Fchar%2Fdisplay7seg.c;h=d92bc8827a9e0d3c7c68b8cef8ed8bce8c9b6acd;hb=8f7c58814eb75bf97b8bc18d107b2e26f28b6585;hp=39f54213a6d5545b0b0ca53c851998c3ded071c0;hpb=3133c5e896c0b2509e72ae0c2cb9452c80d47f46;p=powerpc.git diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c index 39f54213a6..d92bc8827a 100644 --- 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; - int error = 0 + int error = 0; 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; }; - 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; } }