platform-driver-x86: fix wrong merge for compal-laptop.c
authorAxel Lin <axel.lin@gmail.com>
Mon, 14 Mar 2011 10:53:14 +0000 (18:53 +0800)
committerMatthew Garrett <mjg@redhat.com>
Mon, 28 Mar 2011 10:46:03 +0000 (06:46 -0400)
I found the commit 80183a4b
"compal-laptop/fujitsu-laptop/msi-laptop: make dmi_check_cb to return 1 instead of 0"
has wrong patch merge.

The original patch change the return value for dmi_check_cb():
https://lkml.org/lkml/2010/7/2/88
But commit 80183a4b changed the return value for set_backlight_level.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
drivers/platform/x86/compal-laptop.c

index eb95878fa58335aa3a22bea204be4ecb28746046..3994c80549fb09d571ee785be17cc0c8ed92b2a6 100644 (file)
@@ -275,7 +275,7 @@ static int set_backlight_level(int level)
 
        ec_write(BACKLIGHT_LEVEL_ADDR, level);
 
-       return 1;
+       return 0;
 }
 
 static int get_backlight_level(void)
@@ -763,7 +763,7 @@ static int dmi_check_cb(const struct dmi_system_id *id)
        printk(KERN_INFO DRIVER_NAME": Identified laptop model '%s'\n",
                id->ident);
        extra_features = false;
-       return 0;
+       return 1;
 }
 
 static int dmi_check_cb_extra(const struct dmi_system_id *id)
@@ -772,7 +772,7 @@ static int dmi_check_cb_extra(const struct dmi_system_id *id)
                "enabling extra features\n",
                id->ident);
        extra_features = true;
-       return 0;
+       return 1;
 }
 
 static struct dmi_system_id __initdata compal_dmi_table[] = {