From: Markus Elfring <elfr...@users.sourceforge.net>
Date: Wed, 9 Aug 2017 16:21:17 +0200

Move the assignments for four local variables so that they will only
be performed if the corresponding data processing succeeded
by this function.

Signed-off-by: Markus Elfring <elfr...@users.sourceforge.net>
---
 drivers/acpi/acpi_video.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c
index a899faf6ff84..3cc1798676ab 100644
--- a/drivers/acpi/acpi_video.c
+++ b/drivers/acpi/acpi_video.c
@@ -801,10 +801,10 @@ int acpi_video_get_levels(struct acpi_device *device,
                          int *pmax_level)
 {
        union acpi_object *obj = NULL;
-       int i, max_level = 0, count = 0, level_ac_battery = 0;
+       int i, max_level, count, level_ac_battery;
        union acpi_object *o;
        struct acpi_video_device_brightness *br;
-       int result = 0;
+       int result;
        u32 value;
 
        if (!ACPI_SUCCESS(acpi_video_device_lcd_query_levels(device->handle,
@@ -838,6 +838,8 @@ int acpi_video_get_levels(struct acpi_device *device,
                goto out_free;
        }
 
+       max_level = 0;
+       count = 0;
        for (i = 0; i < obj->package.count; i++) {
                o = (union acpi_object *)&obj->package.elements[i];
                if (o->type != ACPI_TYPE_INTEGER) {
@@ -863,6 +865,7 @@ int acpi_video_get_levels(struct acpi_device *device,
         * In this case, the first two elements in _BCL packages
         * are also supported brightness levels that OS should take care of.
         */
+       level_ac_battery = 0;
        for (i = ACPI_VIDEO_FIRST_LEVEL; i < count; i++) {
                if (br->levels[i] == br->levels[ACPI_VIDEO_AC_LEVEL])
                        level_ac_battery++;
@@ -895,7 +898,7 @@ int acpi_video_get_levels(struct acpi_device *device,
        *dev_br = br;
        if (pmax_level)
                *pmax_level = max_level;
-
+       result = 0;
 out:
        kfree(obj);
        return result;
-- 
2.13.4

Reply via email to