git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[pandora-kernel.git]
/
drivers
/
char
/
ds1620.c
diff --git
a/drivers/char/ds1620.c
b/drivers/char/ds1620.c
index
61f0146
..
dbee868
100644
(file)
--- a/
drivers/char/ds1620.c
+++ b/
drivers/char/ds1620.c
@@
-232,7
+232,7
@@
ds1620_read(struct file *file, char __user *buf, size_t count, loff_t *ptr)
}
static int
}
static int
-ds1620_ioctl(struct
inode *inode, struct
file *file, unsigned int cmd, unsigned long arg)
+ds1620_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
struct therm therm;
union {
{
struct therm therm;
union {
@@
-316,6
+316,18
@@
ds1620_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned
return 0;
}
return 0;
}
+static long
+ds1620_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+{
+ int ret;
+
+ lock_kernel();
+ ret = ds1620_ioctl(file, cmd, arg);
+ unlock_kernel();
+
+ return ret;
+}
+
#ifdef THERM_USE_PROC
static int
proc_therm_ds1620_read(char *buf, char **start, off_t offset,
#ifdef THERM_USE_PROC
static int
proc_therm_ds1620_read(char *buf, char **start, off_t offset,
@@
-344,7
+356,7
@@
static const struct file_operations ds1620_fops = {
.owner = THIS_MODULE,
.open = ds1620_open,
.read = ds1620_read,
.owner = THIS_MODULE,
.open = ds1620_open,
.read = ds1620_read,
- .
ioctl = ds1620
_ioctl,
+ .
unlocked_ioctl = ds1620_unlocked
_ioctl,
};
static struct miscdevice ds1620_miscdev = {
};
static struct miscdevice ds1620_miscdev = {