Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bd1911b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog 

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] unlocked_ioctl changes
  [WATCHDOG] wdt285: fix sparse warnings
  [WATCHDOG] ibmasr: remove unnecessary spin_unlock()
parents 1910e021 7275fc8c

drivers/watchdog/geodewdt.c

+3 −3
Original line number Diff line number Diff line
@@ -130,8 +130,8 @@ static ssize_t geodewdt_write(struct file *file, const char __user *data, 
	return len;

}



static int geodewdt_ioctl(struct inode *inode, struct file *file,

				unsigned int cmd, unsigned long arg)

static long geodewdt_ioctl(struct file *file, unsigned int cmd,

				unsigned long arg)

{

	void __user *argp = (void __user *)arg;

	int __user *p = argp;
@@ -198,7 +198,7 @@ static const struct file_operations geodewdt_fops = { 
	.owner          = THIS_MODULE,

	.llseek         = no_llseek,

	.write          = geodewdt_write,

	.ioctl          = geodewdt_ioctl,

	.unlocked_ioctl = geodewdt_ioctl,

	.open           = geodewdt_open,

	.release        = geodewdt_release,

};

drivers/watchdog/pnx4008_wdt.c

+2 −2
Original line number Diff line number Diff line
@@ -173,8 +173,8 @@ static const struct watchdog_info ident = { 
	.identity = "PNX4008 Watchdog",

};



static long pnx4008_wdt_ioctl(struct inode *inode, struct file *file,

					unsigned int cmd, unsigned long arg)

static long pnx4008_wdt_ioctl(struct file *file, unsigned int cmd,

				unsigned long arg)

{

	int ret = -ENOTTY;

	int time;

drivers/watchdog/rc32434_wdt.c

+3 −3
Original line number Diff line number Diff line
@@ -182,8 +182,8 @@ static ssize_t rc32434_wdt_write(struct file *file, const char *data, 
	return 0;

}



static int rc32434_wdt_ioctl(struct inode *inode, struct file *file,

	unsigned int cmd, unsigned long arg)

static long rc32434_wdt_ioctl(struct file *file, unsigned int cmd,

				unsigned long arg)

{

	void __user *argp = (void __user *)arg;

	int new_timeout;
@@ -242,7 +242,7 @@ static struct file_operations rc32434_wdt_fops = { 
	.owner		= THIS_MODULE,

	.llseek		= no_llseek,

	.write		= rc32434_wdt_write,

	.ioctl		= rc32434_wdt_ioctl,

	.unlocked_ioctl	= rc32434_wdt_ioctl,

	.open		= rc32434_wdt_open,

	.release	= rc32434_wdt_release,

};

drivers/watchdog/rdc321x_wdt.c

+3 −3
Original line number Diff line number Diff line
@@ -144,8 +144,8 @@ static int rdc321x_wdt_release(struct inode *inode, struct file *file) 
	return 0;

}



static int rdc321x_wdt_ioctl(struct inode *inode, struct file *file,

				unsigned int cmd, unsigned long arg)

static long rdc321x_wdt_ioctl(struct file *file, unsigned int cmd,

				unsigned long arg)

{

	void __user *argp = (void __user *)arg;

	unsigned int value;
@@ -204,7 +204,7 @@ static ssize_t rdc321x_wdt_write(struct file *file, const char __user *buf, 
static const struct file_operations rdc321x_wdt_fops = {

	.owner		= THIS_MODULE,

	.llseek		= no_llseek,

	.ioctl		= rdc321x_wdt_ioctl,

	.unlocked_ioctl	= rdc321x_wdt_ioctl,

	.open		= rdc321x_wdt_open,

	.write		= rdc321x_wdt_write,

	.release	= rdc321x_wdt_release,

drivers/watchdog/wdt285.c

+8 −7
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static int watchdog_release(struct inode *inode, struct file *file) 
	return 0;

}



static ssize_t watchdog_write(struct file *file, const char *data,

static ssize_t watchdog_write(struct file *file, const char __user *data,

			      size_t len, loff_t *ppos)

{

	/*
@@ -136,18 +136,19 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd, 
			   unsigned long arg)

{

	unsigned int new_margin;

	int __user *int_arg = (int __user *)arg;

	int ret = -ENOTTY;



	switch (cmd) {

	case WDIOC_GETSUPPORT:

		ret = 0;

		if (copy_to_user((void *)arg, &ident, sizeof(ident)))

		if (copy_to_user((void __user *)arg, &ident, sizeof(ident)))

			ret = -EFAULT;

		break;



	case WDIOC_GETSTATUS:

	case WDIOC_GETBOOTSTATUS:

		ret = put_user(0, (int *)arg);

		ret = put_user(0, int_arg);

		break;



	case WDIOC_KEEPALIVE:
@@ -156,7 +157,7 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd, 
		break;



	case WDIOC_SETTIMEOUT:

		ret = get_user(new_margin, (int *)arg);

		ret = get_user(new_margin, int_arg);

		if (ret)

			break;
@@ -171,7 +172,7 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd, 
		watchdog_ping();

		/* Fall */

	case WDIOC_GETTIMEOUT:

		ret = put_user(soft_margin, (int *)arg);

		ret = put_user(soft_margin, int_arg);

		break;

	}

	return ret;