diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 07:49:30 +0100 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 07:49:30 +0100 |
commit | c94f28c383f58c9de74678e0f1624db9c5f8a8cb (patch) | |
tree | 3281184f026cb79cee6c20fe29c994ba654cbbe4 /drivers/char/ppdev.c | |
parent | drm/i915: Fix current tiling check for relaxed fencing (diff) | |
parent | Merge remote branch 'airlied/drm-fixes' into drm-intel-fixes (diff) | |
download | linux-c94f28c383f58c9de74678e0f1624db9c5f8a8cb.tar.xz linux-c94f28c383f58c9de74678e0f1624db9c5f8a8cb.zip |
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_ringbuffer.c
Diffstat (limited to 'drivers/char/ppdev.c')
-rw-r--r-- | drivers/char/ppdev.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c index 723152d978a9..f176dbaeb15a 100644 --- a/drivers/char/ppdev.c +++ b/drivers/char/ppdev.c @@ -613,6 +613,7 @@ static int pp_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg) case PPGETTIME: to_jiffies = pp->pdev->timeout; + memset(&par_timeout, 0, sizeof(par_timeout)); par_timeout.tv_sec = to_jiffies / HZ; par_timeout.tv_usec = (to_jiffies % (long)HZ) * (1000000/HZ); if (copy_to_user (argp, &par_timeout, sizeof(struct timeval))) |