[PATCH 06/21] ACPI-video: Move four assignments in acpi_video_get_levels()

SF Markus Elfring
2016-09-05T16:52:33Z

Date: Mon, 5 Sep 2016 14:40:46 +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 <elfring@users.sourceforge.net>
---
drivers/acpi/acpi_video.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c
index 0799865..0fca196 100644
--- a/drivers/acpi/acpi_video.c
+++ b/drivers/acpi/acpi_video.c
@@ -758,10 +758,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,
@@ -790,6 +790,8 @@ int acpi_video_get_levels(struct acpi_device *device,
goto free_brightness;
}

+ 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) {
@@ -814,6 +816,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 = 2; i < count; i++) {
if (br->levels[i] = br->levels[0])
level_ac_battery++;
@@ -843,6 +846,7 @@ int acpi_video_get_levels(struct acpi_device *device,
*dev_br = br;
if (pmax_level)
*pmax_level = max_level;
+ result = 0;
free_object:
kfree(obj);
return result;
--
2.10.0