From 7a8286c168140b3d1d2339733e6ab74b87b57efa Mon Sep 17 00:00:00 2001 From: Vasiliy Kulikov Date: Wed, 27 Oct 2010 15:34:21 -0700 Subject: [PATCH] --- yaml --- r: 218581 b: refs/heads/master c: b9b1134260e036fb75c468514569864dd6722f3e h: refs/heads/master i: 218579: f7a148f53032e17ee3a49b4e0fff6850204f9298 v: v3 --- [refs] | 2 +- trunk/drivers/char/ppdev.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 92c294f10d4d..ef683be1e9cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 19714a8af8fe8618a9beace1f7a3bb10d55d5e2f +refs/heads/master: b9b1134260e036fb75c468514569864dd6722f3e diff --git a/trunk/drivers/char/ppdev.c b/trunk/drivers/char/ppdev.c index 723152d978a9..f176dbaeb15a 100644 --- a/trunk/drivers/char/ppdev.c +++ b/trunk/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)))