lkml.org 
[lkml]   [2012]   [Feb]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/7] compat: Handle COMPAT_USE_64BIT_TIME in the lp driver
    Date
    From: "H. Peter Anvin" <hpa@zytor.com>

    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>
    ---
    drivers/char/lp.c | 5 +----
    1 files changed, 1 insertions(+), 4 deletions(-)

    diff --git a/drivers/char/lp.c b/drivers/char/lp.c
    index f434856..64f5aeb 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;
    }
    --
    1.7.6.5


    \
     
     \ /
      Last update: 2012-02-20 03:29    [W:0.021 / U:34.072 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site