[PATCH 1/2] Misc: misc-phantom-move-to-unlocked_ioctl-fix

From: Jiri Slaby
Date: Sat May 19 2007 - 05:52:20 EST


misc-phantom-move-to-unlocked_ioctl-fix

Signed-off-by: Jiri Slaby <jirislaby@xxxxxxxxx>

---
commit fd826c7ffca5d1052a742d04f819c0251856cc6b
tree bad1cf29a70b1ff7171e1d2082967ab31f8383aa
parent d2f8feac3bd0ec0cd2d44a41fcbdb7568ac8629e
author Jiri Slaby <jirislaby@xxxxxxxxx> Sat, 19 May 2007 11:20:26 +0200
committer Jiri Slaby <jirislaby@xxxxxxxxx> Sat, 19 May 2007 11:20:26 +0200

drivers/misc/phantom.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/drivers/misc/phantom.c b/drivers/misc/phantom.c
index 6249767..4b5959b 100644
--- a/drivers/misc/phantom.c
+++ b/drivers/misc/phantom.c
@@ -125,9 +125,7 @@ static long phantom_ioctl(struct file *file, unsigned int cmd,
if (r.reg > 7)
return -EINVAL;

- spin_lock(&dev->ioctl_lock);
r.value = ioread32(dev->iaddr + r.reg);
- spin_unlock(&dev->ioctl_lock);

if (copy_to_user(argp, &r, sizeof(r)))
return -EFAULT;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/