Bugfix in LCD initialization.

diff --git a/frsh_api/frsh_power.c b/frsh_api/frsh_power.c
index 59195eb97840dd47f60612bdaf310041eaaea31e..ee7ed864f0fad420ca48e2b4452a326cf04fe604 100644 (file)
--- a/frsh_api/frsh_power.c
+++ b/frsh_api/frsh_power.c
@@ -320,14 +320,14 @@ int frsh_resource_get_num_power_levels
                case FRSH_RT_PROCESSOR:
                {
                        ret = fra_CPU_power_init(resource_id);
-                       if (ret) goto ret;
+                       if (ret) goto out;
 
                        break;
                }
                case FRSH_RT_LCD:
                {
                        ret = fra_LCD_power_init(resource_id);
-                       if (ret) goto ret;
+                       if (ret) goto out;
 
                        break;
                }
@@ -342,7 +342,7 @@ int frsh_resource_get_num_power_levels
         */
        *num_power_levels = 3;
 
-ret:
+out:
        return FRSH_NO_ERROR;
 }
 

diff --git a/resources/acpi_lcd/fra_acpi_lcd.c b/resources/acpi_lcd/fra_acpi_lcd.c
index 3c2b88209c4d26587b96d2cceb8246efe67fe30f..308341d4113ffb33f95f04e44ca4fa1f0cb6bc30 100644 (file)
--- a/resources/acpi_lcd/fra_acpi_lcd.c
+++ b/resources/acpi_lcd/fra_acpi_lcd.c
@@ -20,7 +20,7 @@ static int __parse_proc_brightness(FILE *fd)
        char *token, *ptr = buffer;
 
        if (!fscanf(fd, "levels:%[^\n]", buffer))
-               return errno;
+               return -1;
 
        while ((token = strtok(ptr, " ")) > 0 &&
               n_bright < 100) {