Re: Regression from 2.6.28-rc7: Commit 7cd5b08be3 breaks startup on Toshiba Portege R500

[Frans Pop]

> Hmm. I wonder if the bug is this one-liner (it really looks like an
> idiotic typo).
>
> Can you test?
>
>  drivers/watchdog/iTCO_wdt.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
> index 26173a2..5b395a4 100644
> --- a/drivers/watchdog/iTCO_wdt.c
> +++ b/drivers/watchdog/iTCO_wdt.c
> @@ -392,7 +392,7 @@ static int iTCO_wdt_stop(void)
>  
>         /* Bit 13: TCO_EN -> 1 = Enables the TCO logic to generate SMI#
> */ val32 = inl(SMI_EN);
> -       val32 &= 0x00002000;
> +       val32 |= 0x00002000;
>         outl(val32, SMI_EN);
>  
>         /* Set the NO_REBOOT bit to prevent later reboots, just for
> sure */

Fixes my X.Org issue (http://lkml.org/lkml/2008/12/3/178).

Cheers,
FJP
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/