ACPI: Fix &&/|| confusion in acpi_evaluate_string() (in comment)

Commit Message

Roel Kluin Dec. 31, 2009, 11:56 a.m. UTC

None

Patch

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;