diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-03-14 06:53:14 -0400 |
---|---|---|
committer | Matthew Garrett <mjg@redhat.com> | 2011-03-28 06:46:03 -0400 |
commit | 0e4510f7c9708304104c07e87b7e5e78fb1716d1 (patch) | |
tree | 9f0bae40a430f2174b0d6927e0e3f8c887975103 /drivers/platform | |
parent | bbe24fee22fa045a07ff7e926589ac722c7ee78d (diff) |
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/platform')
-rw-r--r-- | drivers/platform/x86/compal-laptop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c index eb95878fa583..3994c80549fb 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) | |||
275 | 275 | ||
276 | ec_write(BACKLIGHT_LEVEL_ADDR, level); | 276 | ec_write(BACKLIGHT_LEVEL_ADDR, level); |
277 | 277 | ||
278 | return 1; | 278 | return 0; |
279 | } | 279 | } |
280 | 280 | ||
281 | static int get_backlight_level(void) | 281 | static int get_backlight_level(void) |
@@ -763,7 +763,7 @@ static int dmi_check_cb(const struct dmi_system_id *id) | |||
763 | printk(KERN_INFO DRIVER_NAME": Identified laptop model '%s'\n", | 763 | printk(KERN_INFO DRIVER_NAME": Identified laptop model '%s'\n", |
764 | id->ident); | 764 | id->ident); |
765 | extra_features = false; | 765 | extra_features = false; |
766 | return 0; | 766 | return 1; |
767 | } | 767 | } |
768 | 768 | ||
769 | static int dmi_check_cb_extra(const struct dmi_system_id *id) | 769 | 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) | |||
772 | "enabling extra features\n", | 772 | "enabling extra features\n", |
773 | id->ident); | 773 | id->ident); |
774 | extra_features = true; | 774 | extra_features = true; |
775 | return 0; | 775 | return 1; |
776 | } | 776 | } |
777 | 777 | ||
778 | static struct dmi_system_id __initdata compal_dmi_table[] = { | 778 | static struct dmi_system_id __initdata compal_dmi_table[] = { |