Commit af95eade authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Linus Torvalds
Browse files

[PATCH] hpet: fix division by zero in HPET_INFO



Fix a division by zero that happened when the HPET_INFO ioctl was called
before a timer frequency had been set.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Cc: Bob Picco <bob.picco@hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8e8505be
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -494,8 +494,11 @@ hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel)
		{
			struct hpet_info info;

			info.hi_ireqfreq = hpet_time_div(hpetp,
							 devp->hd_ireqfreq);
			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 = devp->hd_hpets->hp_which;