From patchwork Thu Dec 31 11:56:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roel Kluin X-Patchwork-Id: 70360 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBVBrmI9017721 for ; Thu, 31 Dec 2009 11:53:48 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750885AbZLaLxq (ORCPT ); Thu, 31 Dec 2009 06:53:46 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751047AbZLaLxq (ORCPT ); Thu, 31 Dec 2009 06:53:46 -0500 Received: from mail-ew0-f219.google.com ([209.85.219.219]:50398 "EHLO mail-ew0-f219.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750885AbZLaLxp (ORCPT ); Thu, 31 Dec 2009 06:53:45 -0500 Received: by ewy19 with SMTP id 19so4541181ewy.21 for ; Thu, 31 Dec 2009 03:53:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:subject:content-type :content-transfer-encoding; bh=RDpxR0v64oje7rpGObNhajzGeY2WnIz5VVpz3CE5uog=; b=iNRBxjFbMAZWHxLo+Fm7rbssu76omaJsTIV4GTMQmBMOPNDKDXu5zFbvFLCIUO8pN+ 1qqt/BXqRqI9PzYzEGCH8hU3fyMvVu426BoceZMItRLaDr13cem0LJ9ccKvYwv05sIzj qn/IvGNiWj0c/wyfbo1Eeb1DN+h/lME74M29s= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding; b=S1i9lRrgY79PeAmNYjtpbey1CbCpFQS0a4be4p390d1RRo6CQV92RfmYArozWkkM39 tLENvaaes3gus/vig/jQJzNeyqbUam6adi6eKVZKspse/kvDJ3AmJZDOfKFJx+41R41/ 31Sgff7LID7eEVJL83Ki+h+pA93evL0jz5Rts= Received: by 10.213.41.13 with SMTP id m13mr1624459ebe.69.1262260422458; Thu, 31 Dec 2009 03:53:42 -0800 (PST) Received: from zoinx.mars (d133062.upc-d.chello.nl [213.46.133.62]) by mx.google.com with ESMTPS id 28sm29807845eyg.44.2009.12.31.03.53.41 (version=SSLv3 cipher=RC4-MD5); Thu, 31 Dec 2009 03:53:41 -0800 (PST) Message-ID: <4B3C9186.3090904@gmail.com> Date: Thu, 31 Dec 2009 12:56:54 +0100 From: Roel Kluin User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.5) Gecko/20091209 Fedora/3.0-4.fc12 Thunderbird/3.0 MIME-Version: 1.0 To: Len Brown , linux-acpi@vger.kernel.org, Andrew Morton , LKML Subject: [PATCH] ACPI: Fix &&/|| confusion in acpi_evaluate_string() (in comment) Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c index 811fec1..3495b43 100644 --- a/drivers/acpi/utils.c +++ b/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;