Skip to content

Commit

Permalink
compal-laptop/fujitsu-laptop/msi-laptop: make dmi_check_cb to return …
Browse files Browse the repository at this point in the history
…1 instead of 0

dmi_check_system() walks the table running matching functions until
someone returns non zero or we hit the end.

This patch makes dmi_check_cb to return 1 so dmi_check_system() return
immediately when a match is found.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Jonathan Woithe <jwoithe@physics.adelaide.edu.au>
Cc: Matthew Garrett <mjg@redhat.com>a
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
  • Loading branch information
Axel Lin authored and Matthew Garrett committed Aug 3, 2010
1 parent 9be0fcb commit 80183a4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion 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 0;
return 1;
}

static int get_backlight_level(void)
Expand Down
6 changes: 3 additions & 3 deletions drivers/platform/x86/fujitsu-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -603,15 +603,15 @@ static int dmi_check_cb_s6410(const struct dmi_system_id *id)
dmi_check_cb_common(id);
fujitsu->keycode1 = KEY_SCREENLOCK; /* "Lock" */
fujitsu->keycode2 = KEY_HELP; /* "Mobility Center" */
return 0;
return 1;
}

static int dmi_check_cb_s6420(const struct dmi_system_id *id)
{
dmi_check_cb_common(id);
fujitsu->keycode1 = KEY_SCREENLOCK; /* "Lock" */
fujitsu->keycode2 = KEY_HELP; /* "Mobility Center" */
return 0;
return 1;
}

static int dmi_check_cb_p8010(const struct dmi_system_id *id)
Expand All @@ -620,7 +620,7 @@ static int dmi_check_cb_p8010(const struct dmi_system_id *id)
fujitsu->keycode1 = KEY_HELP; /* "Support" */
fujitsu->keycode3 = KEY_SWITCHVIDEOMODE; /* "Presentation" */
fujitsu->keycode4 = KEY_WWW; /* "Internet" */
return 0;
return 1;
}

static struct dmi_system_id fujitsu_dmi_table[] = {
Expand Down
2 changes: 1 addition & 1 deletion drivers/platform/x86/msi-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ static int dmi_check_cb(const struct dmi_system_id *id)
{
printk(KERN_INFO "msi-laptop: Identified laptop model '%s'.\n",
id->ident);
return 0;
return 1;
}

static struct dmi_system_id __initdata msi_dmi_table[] = {
Expand Down

0 comments on commit 80183a4

Please sign in to comment.