Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 0e4510f7c9708304104c07e87b7e5e78fb1716d1

Authored by Axel Lin
Committed by Matthew Garrett
1 parent bbe24fee22
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

drivers/platform/x86/compal-laptop.c
Diff comments   View file @ 0e4510f
... ... @@ -275,7 +275,7 @@
275 275  
276 276 ec_write(BACKLIGHT_LEVEL_ADDR, level);
277 277  
278   - return 1;
  278 + return 0;
279 279 }
280 280  
281 281 static int get_backlight_level(void)
... ... @@ -763,7 +763,7 @@
763 763 printk(KERN_INFO DRIVER_NAME": Identified laptop model '%s'\n",
764 764 id->ident);
765 765 extra_features = false;
766   - return 0;
  766 + return 1;
767 767 }
768 768  
769 769 static int dmi_check_cb_extra(const struct dmi_system_id *id)
... ... @@ -772,7 +772,7 @@
772 772 "enabling extra features\n",
773 773 id->ident);
774 774 extra_features = true;
775   - return 0;
  775 + return 1;
776 776 }
777 777  
778 778 static struct dmi_system_id __initdata compal_dmi_table[] = {