Skip to content

Commit

Permalink
platform-driver-x86: fix wrong merge for compal-laptop.c
Browse files Browse the repository at this point in the history
I found the commit 80183a4
"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 80183a4 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>
  • Loading branch information
Axel Lin authored and Matthew Garrett committed Mar 28, 2011
1 parent bbe24fe commit 0e4510f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/platform/x86/compal-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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[] = {
Expand Down

0 comments on commit 0e4510f

Please sign in to comment.