---

yaml --- r: 218581 b: refs/heads/master c: b9b1134 h: refs/heads/master i: 218579: f7a148f v: v3
git-mirror · Oct 28, 2010 · 7a8286c · 7a8286c
1 parent 3bf8809
commit 7a8286c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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)))