[PATCH] nbd: kill obsolete changelog, add GPL

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

diff --git a/drivers/sbus/char/cpwatchdog.c b/drivers/sbus/char/cpwatchdog.c
index 071ae24be8925b13ddbc03dae77a39d3e4e9de26..5bf3dd901b65db04b6cb6b1c14b052b06aa2884c 100644 (file)
--- a/drivers/sbus/char/cpwatchdog.c
+++ b/drivers/sbus/char/cpwatchdog.c
@@ -304,8 +304,8 @@ static int wd_open(struct inode *inode, struct file *f)
                                                SA_SHIRQ,
                                                WD_OBPNAME,
                                                (void *)wd_dev.regs)) {
-                       printk("%s: Cannot register IRQ %s\n", 
-                               WD_OBPNAME, __irq_itoa(wd_dev.irq));
+                       printk("%s: Cannot register IRQ %d\n", 
+                               WD_OBPNAME, wd_dev.irq);
                        return(-EBUSY);
                }
                wd_dev.initialized = 1;
@@ -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: