From patchwork Wed Mar 18 08:27:10 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Rui" X-Patchwork-Id: 12775 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n2I8QZav021718 for ; Wed, 18 Mar 2009 08:27:03 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751779AbZCRI1D (ORCPT ); Wed, 18 Mar 2009 04:27:03 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752263AbZCRI1D (ORCPT ); Wed, 18 Mar 2009 04:27:03 -0400 Received: from mga11.intel.com ([192.55.52.93]:39078 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751779AbZCRI1B (ORCPT ); Wed, 18 Mar 2009 04:27:01 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 18 Mar 2009 01:23:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.38,383,1233561600"; d="scan'208";a="439857429" Received: from rzhang-dt.sh.intel.com (HELO [10.239.36.58]) ([10.239.36.58]) by fmsmga002.fm.intel.com with ESMTP; 18 Mar 2009 01:22:05 -0700 Subject: [RESEND PATCH 2/6] ACPI video: check the return value of acpi_video_device_lcd_set_level From: Zhang Rui To: Len Brown Cc: linux-acpi , Matthew Garrett , Thomas Renninger , "Zhang, Rui" Date: Wed, 18 Mar 2009 16:27:10 +0800 Message-Id: <1237364830.3826.58.camel@rzhang-dt> Mime-Version: 1.0 X-Mailer: Evolution 2.22.1 (2.22.1-2.fc9) Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Subject: check the return value of acpi_video_device_lcd_set_level From: Zhang Rui check the return value of acpi_video_device_lcd_set_level. Signed-off-by: Zhang Rui Acked-by: Matthew Garrett Acked-by: Thomas Renninger --- drivers/acpi/video.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-2.6/drivers/acpi/video.c =================================================================== --- linux-2.6.orig/drivers/acpi/video.c +++ linux-2.6/drivers/acpi/video.c @@ -322,12 +322,12 @@ static int acpi_video_get_brightness(str static int acpi_video_set_brightness(struct backlight_device *bd) { - int request_level = bd->props.brightness+2; + int request_level = bd->props.brightness + 2; struct acpi_video_device *vd = (struct acpi_video_device *)bl_get_data(bd); - acpi_video_device_lcd_set_level(vd, - vd->brightness->levels[request_level]); - return 0; + + return acpi_video_device_lcd_set_level(vd, + vd->brightness->levels[request_level]); } static struct backlight_ops acpi_backlight_ops = { @@ -482,23 +482,29 @@ acpi_video_device_lcd_query_levels(struc static int acpi_video_device_lcd_set_level(struct acpi_video_device *device, int level) { - int status = AE_OK; + int status; union acpi_object arg0 = { ACPI_TYPE_INTEGER }; struct acpi_object_list args = { 1, &arg0 }; int state; - arg0.integer.value = level; - if (device->cap._BCM) - status = acpi_evaluate_object(device->dev->handle, "_BCM", - &args, NULL); + status = acpi_evaluate_object(device->dev->handle, "_BCM", + &args, NULL); + if (ACPI_FAILURE(status)) { + ACPI_ERROR((AE_INFO, "Evaluating _BCM failed")); + return -EIO; + } + device->brightness->curr = level; for (state = 2; state < device->brightness->count; state++) - if (level == device->brightness->levels[state]) + if (level == device->brightness->levels[state]) { device->backlight->props.brightness = state - 2; + return 0; + } - return status; + ACPI_ERROR((AE_INFO, "Current brightness invalid")); + return -EINVAL; } static int @@ -1082,13 +1088,12 @@ acpi_video_device_write_brightness(struc /* validate through the list of available levels */ for (i = 2; i < dev->brightness->count; i++) if (level == dev->brightness->levels[i]) { - if (ACPI_SUCCESS - (acpi_video_device_lcd_set_level(dev, level))) - dev->brightness->curr = level; + if (!acpi_video_device_lcd_set_level(dev, level)) + return count; break; } - return count; + return -EINVAL; } static int acpi_video_device_EDID_seq_show(struct seq_file *seq, void *offset) @@ -1786,7 +1791,7 @@ acpi_video_switch_brightness(struct acpi level_next = acpi_video_get_next_level(device, level_current, event); - acpi_video_device_lcd_set_level(device, level_next); + result = acpi_video_device_lcd_set_level(device, level_next); out: if (result)