Merge branch 'ec-cleanup' into release

[pandora-kernel.git] / drivers / platform / x86 / compal-laptop.c

diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
index f4f43e6..9b3afb6 100644 (file)
--- a/drivers/platform/x86/compal-laptop.c
+++ b/drivers/platform/x86/compal-laptop.c
@@ -201,7 +201,7 @@ static bool extra_features;
  * into 0x4F and read a few bytes from the output, like so:
  *     u8 writeData = 0x33;
  *     ec_transaction(0x4F, &writeData, 1, buffer, 32);
- * That address is labled "fan1 table information" in the service manual.
+ * That address is labeled "fan1 table information" in the service manual.
  * It should be clear which value in 'buffer' changes). This seems to be
  * related to fan speed. It isn't a proper 'realtime' fan speed value
  * though, because physically stopping or speeding up the fan doesn't
@@ -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[] = {
@@ -970,6 +970,7 @@ static int __init compal_init(void)
        if (!acpi_video_backlight_support()) {
                struct backlight_properties props;
                memset(&props, 0, sizeof(struct backlight_properties));
+               props.type = BACKLIGHT_PLATFORM;
                props.max_brightness = BACKLIGHT_LEVEL_MAX;
                compalbl_device = backlight_device_register(DRIVER_NAME,
                                                            NULL, NULL,