[patch] Fix for 2.4.10's broken char/joystick/analog.c

From: Vojtech Pavlik (vojtech@suse.cz)
Date: Wed Sep 26 2001 - 03:00:24 EST

Next message: Vojtech Pavlik: "Re: 2.4.10 problems with X + USB mouse"
Previous message: jc: "Re: apm suspend broken in 2.4.10 , more info"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

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
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Next message: Vojtech Pavlik: "Re: 2.4.10 problems with X + USB mouse"
Previous message: jc: "Re: apm suspend broken in 2.4.10 , more info"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

This archive was generated by hypermail 2b29 : Sun Sep 30 2001 - 21:00:41 EST