Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 856fe98f authored by Jim Cromie's avatar Jim Cromie Committed by Linus Torvalds
Browse files

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

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: default avatarJim Cromie <jim.cromie@gmail.com>
Cc: <alexander.krause@erazor-zone.de>
Cc: <dzpost@dedekind.net>
Cc: <phelps@mantara.com>
Acked-by: default avatarJohn Stultz <johnstul@us.ibm.com>
Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9bded00b

drivers/clocksource/scx200_hrt.c

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static struct clocksource cs_hrt = { 


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())

		return -ENODEV;
@@ -76,7 +76,7 @@ static int __init init_hrt_clocksource(void) 
	}



	/* write timer config */

	outb(HR_TMEN | (mhz27) ? HR_TMCLKSEL : 0,

	outb(HR_TMEN | (mhz27 ? HR_TMCLKSEL : 0),

	     scx200_cb_base + SCx200_TMCNFG_OFFSET);



	if (mhz27) {

include/linux/scx200.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ extern unsigned scx200_cb_base; 


/* High Resolution Timer */

#define SCx200_TIMER_OFFSET 0x08

#define SCx200_TIMER_SIZE 0x05

#define SCx200_TIMER_SIZE 0x06



/* Clock Generators */

#define SCx200_CLOCKGEN_OFFSET 0x10