From patchwork Tue Feb 2 22:37:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 76530 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o12MdHVS005025 for ; Tue, 2 Feb 2010 22:39:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932120Ab0BBWjB (ORCPT ); Tue, 2 Feb 2010 17:39:01 -0500 Received: from smtp1.linux-foundation.org ([140.211.169.13]:49524 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932106Ab0BBWjA (ORCPT ); Tue, 2 Feb 2010 17:39:00 -0500 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 o12Mbt98010821 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 2 Feb 2010 14:37:56 -0800 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 o12Mbtwp018684; Tue, 2 Feb 2010 14:37:55 -0800 Message-Id: <201002022237.o12Mbtwp018684@imap1.linux-foundation.org> Subject: [patch 2/7] acpi: fix &&/|| confusion in acpi_evaluate_string() (in comment) To: lenb@kernel.org Cc: linux-acpi@vger.kernel.org, akpm@linux-foundation.org, roel.kluin@gmail.com From: akpm@linux-foundation.org Date: Tue, 02 Feb 2010 14:37:55 -0800 MIME-Version: 1.0 X-Spam-Status: No, hits=-3.518 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, 02 Feb 2010 22:39:18 +0000 (UTC) diff -puN drivers/acpi/utils.c~acpi-fix-confusion-in-acpi_evaluate_string-in-comment drivers/acpi/utils.c --- a/drivers/acpi/utils.c~acpi-fix-confusion-in-acpi_evaluate_string-in-comment +++ a/drivers/acpi/utils.c @@ -312,7 +312,7 @@ acpi_evaluate_string(acpi_handle handle, element = (acpi_object *) buffer.pointer; if ((element->type != ACPI_TYPE_STRING) - || (element->type != ACPI_TYPE_BUFFER) + && (element->type != ACPI_TYPE_BUFFER) || !element->string.length) { acpi_util_eval_error(handle, pathname, AE_BAD_DATA); return AE_BAD_DATA;