Re: -tip: origin tree boot crash

From: Len Brown
Date: Sat Dec 26 2009 - 15:19:18 EST


> dell-wmi - fix condition to abort driver loading


applied to acpi-test

thanks,
-Len Brown, Intel Open Source Technology Center

> From: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
>
> 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@xxxxxxx>
> ---
>
> 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@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
--
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/