From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S938708AbcIERUH (ORCPT ); Mon, 5 Sep 2016 13:20:07 -0400 Received: from mout.web.de ([212.227.15.14]:64292 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934258AbcIEQw6 (ORCPT ); Mon, 5 Sep 2016 12:52:58 -0400 Subject: [PATCH 06/21] ACPI-video: Move four assignments in acpi_video_get_levels() To: linux-acpi@vger.kernel.org, Hans de Goede , Len Brown , "Rafael J. Wysocki" , Zhang Rui References: <566ABCD9.1060404@users.sourceforge.net> <897ebf36-2fe5-e109-adf6-b81b6e863d9a@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall , Paolo Bonzini From: SF Markus Elfring Message-ID: Date: Mon, 5 Sep 2016 18:52:33 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <897ebf36-2fe5-e109-adf6-b81b6e863d9a@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:khaFepf71XQTHLw3fk+vnYQP38vefAF0BaCzYAtHHsDSKzB6tba aatQ2QTebwqtNdaUY/PVchQ/mKGILXDxKJ5m5is8jtS9MwBPKaNDGk3h+Bz3DxllABsYmJZ MsK/s1n05ioafeIgU2IhOameQby6dKZMoazgMrcNvHz7z2iAlNw5dEt4GnHj8QCJT0qj0WW zMY9cn5o59zvmKhCkAFtg== X-UI-Out-Filterresults: notjunk:1;V01:K0:9C0+X4sl1II=:WSzjoy0AgU31YxK7KfZGog TwG0st1ay6F9HFHcmyjfwbAPoaFJy20MFnLkPsDUJzFLx4MzlQyH2aF+Sl8T5YLSxMA9fjczw Gg+r5w+KzZtvA5BxMs/3qpMxTELOLPwAYBSHb1JZY3A+6i9celXHlI/XVJJjzx21XNHczVAOq QkdwVaxAzZuZWlOBSxY5s/SYHejMaGSqX7YNgqR3/hctthJ2BYNgTq0++IBa6oycVsrSSx5E+ hQ31wIrcCJ5f+iWuVmemFtH65hS2mSrXkdOecCIblexvSlQ3b8o+ksLPIkV64FBb8F1VAMad2 JR1E2EBukfv1/v12CpFf70a5u4cPxRMJ/YFtDa/NihJnvtI7USMUJCabXuZ+NCZYwXYydJx5L oe1bZit9MXSbszUJ5gbBa8HSKLgsE4ebmLQM54hEJVysE8GpsMw8Stm26V7Utb5aspfhp2ZjC ruaJ6ex4vXEorMqo8hlj8zG1TnbZlF9f1TJ204NUMk5VNsgHyKHiiXxGY53uwA3k7f382d/H7 jN5U2JT0yJrfe1zTu0uD9SkxoCMIv82N7bWxyupI0PUqmWj+WRIJ00QxT9zk/eIAqvGQLnhLp eEHFnuFA6v5s4rJdzg8BHCOg90EU4rrE0eVFGhU7YVco83aKNvBuhwQHyyR7amkz/yDoV29Xq ri14y0g2wIjLgTIU5ha9eHm72PaotpEHe+hLNy2bnKy8tzn3SdpdaRqN6KW7DJIvsuvXmg3s3 0+ycdHGIaI6OxeC3msIsGI5GEQ/mgIfEGxIVBCMX5bvoRhOvAmgjwK5n1KFthExal4ThKuR6t 7GGYTk3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring 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 --- 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