]> err.no Git - linux-2.6/commitdiff
[SPARC]: Fix locking thinkos in display7seg and cpwatchdog drivers.
authorDavid S. Miller <davem@sunset.davemloft.net>
Wed, 9 Nov 2005 20:05:37 +0000 (12:05 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Wed, 9 Nov 2005 20:05:37 +0000 (12:05 -0800)
Noticed by Eric Brower.

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/sbus/char/cpwatchdog.c
drivers/sbus/char/display7seg.c

index 071ae24be8925b13ddbc03dae77a39d3e4e9de26..fd2cc7782f7680bc8e786c39aa04690201244e09 100644 (file)
@@ -407,7 +407,7 @@ static long wd_compat_ioctl(struct file *file, unsigned int cmd,
        case WIOCGSTAT:
                lock_kernel();
                rval = wd_ioctl(file->f_dentry->d_inode, file, cmd, arg);
-               lock_kernel();
+               unlock_kernel();
                break;
        /* everything else is handled by the generic compat layer */
        default:
index 39f54213a6d5545b0b0ca53c851998c3ded071c0..2c86a4b809cd1c8482fcf15aee90e5b707730a9e 100644 (file)
@@ -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;
 }