public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [patch] Fix for 2.4.10's broken char/joystick/analog.c
@ 2001-09-26  8:00 Vojtech Pavlik
  0 siblings, 0 replies; only message in thread
From: Vojtech Pavlik @ 2001-09-26  8:00 UTC (permalink / raw)
  To: Linus Torvalds, Alan Cox; +Cc: linux-kernel

Hi!

My x86_64 fixes broke my own analog.c in 2.4.10 on machines with TSC.
Here is a patch that adds the missing braces. With this patch it is
verified to work fine. My apologies.

--- linux-2.4.10/drivers/char/joystick/analog.c	Fri Sep 14 23:40:00 2001
+++ linux/drivers/char/joystick/analog.c	Wed Sep 26 09:56:35 2001
@@ -138,7 +138,7 @@
 
 #ifdef __i386__
 #define TSC_PRESENT	(test_bit(X86_FEATURE_TSC, &boot_cpu_data.x86_capability))
-#define GET_TIME(x)	do { if (TSC_PRESENT) rdtscl(x); else outb(0, 0x43); x = inb(0x40); x |= inb(0x40) << 8; } while (0)
+#define GET_TIME(x)	do { if (TSC_PRESENT) rdtscl(x); else { outb(0, 0x43); x = inb(0x40); x |= inb(0x40) << 8; } } while (0)
 #define DELTA(x,y)	(TSC_PRESENT?((y)-(x)):((x)-(y)+((x)<(y)?1193180L/HZ:0)))
 #define TIME_NAME	(TSC_PRESENT?"TSC":"PIT")
 #elif __x86_64__

-- 
Vojtech Pavlik
SuSE Labs

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2001-09-26  9:33 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2001-09-26  8:00 [patch] Fix for 2.4.10's broken char/joystick/analog.c Vojtech Pavlik

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox