Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-10 15:19:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PATCH] scx200_hrt: fix precedence bug manifesting as 27x clock in 1 MHz mode

Browse Source 
Fix paren-placement / precedence bug breaking initialization for 1 MHz
clock mode.

Also fix comment spelling error, and fence-post (off-by-one) error on
symbol used in request_region.

Addresses http://bugzilla.kernel.org/show_bug.cgi?id=7242

Thanks alexander.krause@erazor-zone.de, dzpost@dedekind.net, for the
reports and patch test, and phelps@mantara.com for the independent patch
and verification.

Signed-off-by:  Jim Cromie <jim.cromie@gmail.com>
Cc: <alexander.krause@erazor-zone.de>
Cc: <dzpost@dedekind.net>
Cc: <phelps@mantara.com>
Acked-by: John Stultz <johnstul@us.ibm.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jim Cromie 2006-10-04 02:15:35 -07:00 committed by Linus Torvalds
parent 9bded00bf6
commit 856fe98f16
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/clocksource/scx200_hrt.c
View File

@ -63,7 +63,7 @@ static struct clocksource cs_hrt = {
static int __init init_hrt_clocksource(void) static int __init init_hrt_clocksource(void)
{ {
/* Make sure scx200 has initializedd the configuration block */ /* Make sure scx200 has initialized the configuration block */
if (!scx200_cb_present()) if (!scx200_cb_present())
return -ENODEV; return -ENODEV;
@ -76,7 +76,7 @@ static int __init init_hrt_clocksource(void)
} }
/* write timer config */ /* write timer config */
outb(HR_TMEN | (mhz27) ? HR_TMCLKSEL : 0, outb(HR_TMEN | (mhz27 ? HR_TMCLKSEL : 0),
scx200_cb_base + SCx200_TMCNFG_OFFSET); scx200_cb_base + SCx200_TMCNFG_OFFSET);
if (mhz27) { if (mhz27) {

2
include/linux/scx200.h
View File

@ -32,7 +32,7 @@ extern unsigned scx200_cb_base;
/* High Resolution Timer */ /* High Resolution Timer */
#define SCx200_TIMER_OFFSET 0x08 #define SCx200_TIMER_OFFSET 0x08
#define SCx200_TIMER_SIZE 0x05 #define SCx200_TIMER_SIZE 0x06
/* Clock Generators */ /* Clock Generators */
#define SCx200_CLOCKGEN_OFFSET 0x10 #define SCx200_CLOCKGEN_OFFSET 0x10