summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-03-14 18:53:14 +0800
committerMatthew Garrett <mjg@redhat.com>2011-03-28 06:46:03 -0400
commit0e4510f7c9708304104c07e87b7e5e78fb1716d1 (patch)
tree9f0bae40a430f2174b0d6927e0e3f8c887975103 /drivers
parentbbe24fee22fa045a07ff7e926589ac722c7ee78d (diff)
downloadlinux-3.10-0e4510f7c9708304104c07e87b7e5e78fb1716d1.tar.gz
linux-3.10-0e4510f7c9708304104c07e87b7e5e78fb1716d1.tar.bz2
linux-3.10-0e4510f7c9708304104c07e87b7e5e78fb1716d1.zip
platform-driver-x86: fix wrong merge for compal-laptop.c
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/platform/x86/compal-laptop.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
index eb95878fa58..3994c80549f 100644
--- a/drivers/platform/x86/compal-laptop.c
+++ b/drivers/platform/x86/compal-laptop.c
@@ -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[] = {