From patchwork Tue Jul 20 22:19:48 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 113115 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6KMeSXI013008 for ; Tue, 20 Jul 2010 22:40:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932956Ab0GTWkc (ORCPT ); Tue, 20 Jul 2010 18:40:32 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:38260 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932953Ab0GTWkb (ORCPT ); Tue, 20 Jul 2010 18:40:31 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id o6KMUktc015865 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 20 Jul 2010 15:40:13 -0700 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id o6KMJmJg021061; Tue, 20 Jul 2010 15:19:48 -0700 Message-Id: <201007202219.o6KMJmJg021061@imap1.linux-foundation.org> Subject: [patch 17/26] asus-laptop: return proper error for store_ledd if write_acpi_int fail To: mjg59@srcf.ucam.org Cc: platform-driver-x86@vger.kernel.org, linux-acpi@vger.kernel.org, akpm@linux-foundation.org, axel.lin@gmail.com, alan-jenkins@tuffmail.co.uk, corentincj@iksaif.net, mjg@redhat.com From: akpm@linux-foundation.org Date: Tue, 20 Jul 2010 15:19:48 -0700 MIME-Version: 1.0 X-Spam-Status: No, hits=-3.496 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 20 Jul 2010 22:40:55 +0000 (UTC) diff -puN drivers/platform/x86/asus-laptop.c~asus-laptop-return-proper-error-for-store_ledd-if-write_acpi_int-fail drivers/platform/x86/asus-laptop.c --- a/drivers/platform/x86/asus-laptop.c~asus-laptop-return-proper-error-for-store_ledd-if-write_acpi_int-fail +++ a/drivers/platform/x86/asus-laptop.c @@ -796,10 +796,11 @@ static ssize_t store_ledd(struct device rv = parse_arg(buf, count, &value); if (rv > 0) { - if (write_acpi_int(asus->handle, METHOD_LEDD, value)) + if (write_acpi_int(asus->handle, METHOD_LEDD, value)) { pr_warning("LED display write failed\n"); - else - asus->ledd_status = (u32) value; + return -ENODEV; + } + asus->ledd_status = (u32) value; } return rv; }