Merge by hand (whitespace conflicts in libata.h)

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

4 files changed, 27 insertions, 2 deletions

diff --git a/drivers/sbus/char/cpwatchdog.c b/drivers/sbus/char/cpwatchdog.c
index 071ae24be892..fd2cc7782f76 100644
--- a/drivers/sbus/char/cpwatchdog.c
+++ b/drivers/sbus/char/cpwatchdog.c
@@ -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:
diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c
index 39f54213a6d5..2c86a4b809cd 100644
--- a/drivers/sbus/char/display7seg.c
+++ b/drivers/sbus/char/display7seg.c
@@ -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;
 }
diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c
index 5028ac214326..383a95f34a0d 100644
--- a/drivers/sbus/char/openprom.c
+++ b/drivers/sbus/char/openprom.c
@@ -596,6 +596,8 @@ static long openprom_compat_ioctl(struct file *file, unsigned int cmd,
                 lock_kernel();
                 break;
         }
+
+        return rval;
 }
 
 static int openprom_open(struct inode * inode, struct file * file)
@@ -623,6 +625,7 @@ static struct file_operations openprom_fops = {
         .owner =        THIS_MODULE,
         .llseek =       no_llseek,
         .ioctl =        openprom_ioctl,
+        .compat_ioctl = openprom_compat_ioctl,
         .open =         openprom_open,
         .release =      openprom_release,
 };
diff --git a/drivers/sbus/char/rtc.c b/drivers/sbus/char/rtc.c
index 9b988baf0b51..5774bdd0e26f 100644
--- a/drivers/sbus/char/rtc.c
+++ b/drivers/sbus/char/rtc.c
@@ -210,6 +210,27 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
         }
 }
 
+static long rtc_compat_ioctl(struct file *file, unsigned int cmd,
+        unsigned long arg)
+{
+        int rval = -ENOIOCTLCMD;
+
+        switch (cmd) {
+        /*
+         * These two are specific to this driver, the generic rtc ioctls
+         * are hanlded elsewhere.
+         */
+        case RTCGET:
+        case RTCSET:
+                lock_kernel();
+                rval = rtc_ioctl(file->f_dentry->d_inode, file, cmd, arg);
+                unlock_kernel();
+                break;
+        }
+
+        return rval;
+}
+
 static int rtc_open(struct inode *inode, struct file *file)
 {
         int ret;
@@ -237,6 +258,7 @@ static struct file_operations rtc_fops = {
         .owner =        THIS_MODULE,
         .llseek =       no_llseek,
         .ioctl =        rtc_ioctl,
+        .compat_ioctl = rtc_compat_ioctl,
         .open =         rtc_open,
         .release =      rtc_release,
 };