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 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial
[pandora-kernel.git]
/
drivers
/
char
/
watchdog
/
sbc_epx_c3.c
diff --git
a/drivers/char/watchdog/sbc_epx_c3.c
b/drivers/char/watchdog/sbc_epx_c3.c
index
7a4dfb9
..
8882b42
100644
(file)
--- a/
drivers/char/watchdog/sbc_epx_c3.c
+++ b/
drivers/char/watchdog/sbc_epx_c3.c
@@
-15,7
+15,6
@@
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/fs.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/fs.h>
@@
-92,7
+91,7
@@
static int epx_c3_release(struct inode *inode, struct file *file)
return 0;
}
return 0;
}
-static ssize_t epx_c3_write(struct file *file, const char *data,
+static ssize_t epx_c3_write(struct file *file, const char
__user
*data,
size_t len, loff_t *ppos)
{
/* Refresh the timer. */
size_t len, loff_t *ppos)
{
/* Refresh the timer. */
@@
-105,6
+104,7
@@
static int epx_c3_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
int options, retval = -EINVAL;
unsigned int cmd, unsigned long arg)
{
int options, retval = -EINVAL;
+ int __user *argp = (void __user *)arg;
static struct watchdog_info ident = {
.options = WDIOF_KEEPALIVEPING |
WDIOF_MAGICCLOSE,
static struct watchdog_info ident = {
.options = WDIOF_KEEPALIVEPING |
WDIOF_MAGICCLOSE,
@@
-114,20
+114,19
@@
static int epx_c3_ioctl(struct inode *inode, struct file *file,
switch (cmd) {
case WDIOC_GETSUPPORT:
switch (cmd) {
case WDIOC_GETSUPPORT:
- if (copy_to_user((struct watchdog_info *)arg,
- &ident, sizeof(ident)))
+ if (copy_to_user(argp, &ident, sizeof(ident)))
return -EFAULT;
return 0;
case WDIOC_GETSTATUS:
case WDIOC_GETBOOTSTATUS:
return -EFAULT;
return 0;
case WDIOC_GETSTATUS:
case WDIOC_GETBOOTSTATUS:
- return put_user(0,
(int *)arg
);
+ return put_user(0,
argp
);
case WDIOC_KEEPALIVE:
epx_c3_pet();
return 0;
case WDIOC_GETTIMEOUT:
case WDIOC_KEEPALIVE:
epx_c3_pet();
return 0;
case WDIOC_GETTIMEOUT:
- return put_user(WATCHDOG_TIMEOUT,
(int *)arg
);
- case WDIOC_SETOPTIONS:
{
- if (get_user(options,
(int *)arg
))
+ return put_user(WATCHDOG_TIMEOUT,
argp
);
+ case WDIOC_SETOPTIONS:
+ if (get_user(options,
argp
))
return -EFAULT;
if (options & WDIOS_DISABLECARD) {
return -EFAULT;
if (options & WDIOS_DISABLECARD) {
@@
-141,9
+140,8
@@
static int epx_c3_ioctl(struct inode *inode, struct file *file,
}
return retval;
}
return retval;
- }
default:
default:
- return -ENO
IOCTLCMD
;
+ return -ENO
TTY
;
}
}
}
}
@@
-156,7
+154,7
@@
static int epx_c3_notify_sys(struct notifier_block *this, unsigned long code,
return NOTIFY_DONE;
}
return NOTIFY_DONE;
}
-static struct file_operations epx_c3_fops = {
+static
const
struct file_operations epx_c3_fops = {
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = epx_c3_write,
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = epx_c3_write,