summaryrefslogtreecommitdiffstats
path: root/drivers/char/lp.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2012-02-10 14:08:52 -0800
committerH. Peter Anvin <hpa@zytor.com>2012-02-20 12:48:47 -0800
commit9dd4ccaaf8cde924b78ba5f5b1a8ce3e7ead687f (patch)
treefcd2b60f8d41ef86ab7eb73bb3dcaf154ed4cd8d /drivers/char/lp.c
parent6684ba202b5ab2f36d574c72fe50c207d99b3e35 (diff)
downloadop-kernel-dev-9dd4ccaaf8cde924b78ba5f5b1a8ce3e7ead687f.zip
op-kernel-dev-9dd4ccaaf8cde924b78ba5f5b1a8ce3e7ead687f.tar.gz
compat: Handle COMPAT_USE_64BIT_TIME in the lp driver
Enable the lp driver to be used with a compat ABI with 64-bit time. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Greg Kroah-Hartman <greg@kroah.com>
Diffstat (limited to 'drivers/char/lp.c')
-rw-r--r--drivers/char/lp.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/char/lp.c b/drivers/char/lp.c
index f434856..a270971 100644
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
@@ -706,16 +706,13 @@ static long lp_compat_ioctl(struct file *file, unsigned int cmd,
{
unsigned int minor;
struct timeval par_timeout;
- struct compat_timeval __user *tc;
int ret;
minor = iminor(file->f_path.dentry->d_inode);
mutex_lock(&lp_mutex);
switch (cmd) {
case LPSETTIMEOUT:
- tc = compat_ptr(arg);
- if (get_user(par_timeout.tv_sec, &tc->tv_sec) ||
- get_user(par_timeout.tv_usec, &tc->tv_usec)) {
+ if (compat_get_timeval(&par_timeout, compat_ptr(arg))) {
ret = -EFAULT;
break;
}
OpenPOWER on IntegriCloud