[<prev] [next>] [day] [month] [year] [list]
Message-ID: <4B3C9186.3090904@gmail.com>
Date:	Thu, 31 Dec 2009 12:56:54 +0100
From:	Roel Kluin <roel.kluin@...il.com>
To:	Len Brown <lenb@...nel.org>, linux-acpi@...r.kernel.org,
	Andrew Morton <akpm@...ux-foundation.org>,
	LKML <linux-kernel@...r.kernel.org>
Subject: [PATCH] ACPI: Fix &&/|| confusion in acpi_evaluate_string() (in comment)
This always evaluates to true.
Signed-off-by: Roel Kluin <roel.kluin@...il.com>
---
 drivers/acpi/utils.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
It's between an #if 0 ... #endif.
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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
Powered by blists - more mailing lists
 
