---

yaml --- r: 217502 b: refs/heads/master c: dae512e h: refs/heads/master v: v3
git-mirror · Oct 26, 2010 · 85ed9c2 · 85ed9c2
1 parent b3f57df
commit 85ed9c2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aaaddfe0b3bb449b8734bf29bbd36141076e5277
+refs/heads/master: dae512edc6e945e127f0848aa757055265d70aa2
diff --git a/trunk/drivers/char/hpet.c b/trunk/drivers/char/hpet.c
@@ -596,11 +596,10 @@ hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
 		break;
 	case HPET_INFO:
 		{
+			memset(info, 0, sizeof(*info));
 			if (devp->hd_ireqfreq)
 				info->hi_ireqfreq =
 					hpet_time_div(hpetp, devp->hd_ireqfreq);
-			else
-				info->hi_ireqfreq = 0;
 			info->hi_flags =
 			    readq(&timer->hpet_config) & Tn_PER_INT_CAP_MASK;
 			info->hi_hpet = hpetp->hp_which;