From 592fd0a8de6f53db376ad497e91c090e999b0de4 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Fri, 10 Feb 2012 14:08:52 -0800
Subject: [PATCH] --- yaml --- r: 297709 b: refs/heads/master c:
 9dd4ccaaf8cde924b78ba5f5b1a8ce3e7ead687f h: refs/heads/master i:   297707:
 5afb025721362f76faa40ca72f0f1cf924433876 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/char/lp.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 05a6faaa9a04..db2d5c4d2e53 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6684ba202b5ab2f36d574c72fe50c207d99b3e35
+refs/heads/master: 9dd4ccaaf8cde924b78ba5f5b1a8ce3e7ead687f
diff --git a/trunk/drivers/char/lp.c b/trunk/drivers/char/lp.c
index f43485607063..a27097173b3a 100644
--- a/trunk/drivers/char/lp.c
+++ b/trunk/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;
 		}