[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20091225194935.GA23802@core.coreip.homeip.net>
Date: Fri, 25 Dec 2009 11:49:35 -0800
From: Dmitry Torokhov <dmitry.torokhov@...il.com>
To: Ingo Molnar <mingo@...e.hu>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>,
Len Brown <lenb@...nel.org>, Matthew Garrett <mjg@...hat.com>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: -tip: origin tree boot crash
On Fri, Dec 25, 2009 at 11:27:31AM +0100, Ingo Molnar wrote:
>
> Today's -tip crashed during bootup on one of my testsystems:
>
...
>
> The crash is due to this commit from yesterday's (v2.6.33-rc2) upstream tree:
>
> | commit 1fdd407f4e3f2ecb453954cbebb6c22491c61853
> | Author: Dmitry Torokhov <dmitry.torokhov@...il.com>
> | Date: Thu Dec 17 22:19:42 2009 -0800
> |
> | dell-wmi: do not keep driver loaded on unsupported boxes
> |
> | There is no point in having the driver loaded in memory if we fail
> | to locate particular WMI GUID.
> |
> | Signed-off-by: Dmitry Torokhov <dtor@...l.ru>
> | Acked-by: Matthew Garrett <mjg@...hat.com>
> | Signed-off-by: Len Brown <len.brown@...el.com>
>
> I've reverted the commit from -tip for now.
>
Hmm, the patch is busted in one way, but it should not be crashing like
that still... I wonder what is going on. Still, the patch below should
help it a bit.
--
Dmitry
dell-wmi - fix condition to abort driver loading
From: Dmitry Torokhov <dmitry.torokhov@...il.com>
The commit 1fdd407f4e3f2ecb453954cbebb6c22491c61853 incorrectly made driver
abort loading when known GUID is present when it should have done exactly
the opposite.
Signed-off-by: Dmitry Torokhov <dtor@...l.ru>
---
drivers/platform/x86/dell-wmi.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c
index 916ccb2..c980782 100644
--- a/drivers/platform/x86/dell-wmi.c
+++ b/drivers/platform/x86/dell-wmi.c
@@ -324,7 +324,7 @@ static int __init dell_wmi_init(void)
{
int err;
- if (wmi_has_guid(DELL_EVENT_GUID)) {
+ if (!wmi_has_guid(DELL_EVENT_GUID)) {
printk(KERN_WARNING "dell-wmi: No known WMI GUID found\n");
return -ENODEV;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists