summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-08 10:23:00 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-08 10:23:00 -0800
commita52e8381c430896d3bd6065a34fda99cb5c74c82 (patch)
tree549c65dab5e5b2a0358ff45a3bcd37f2e37ffec4 /drivers
parentbe9d122730c878baafe11e70d1436faac229f2fc (diff)
parentda1605465ebdb9dc25296a354394086cd559c243 (diff)
downloadop-kernel-dev-a52e8381c430896d3bd6065a34fda99cb5c74c82.zip
op-kernel-dev-a52e8381c430896d3bd6065a34fda99cb5c74c82.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'drivers')
-rw-r--r--drivers/sbus/char/openprom.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c
index 5028ac2..383a95f 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,
};
OpenPOWER on IntegriCloud