projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ACPICA: update Intel copyright
[deliverable/linux.git]
/
drivers
/
acpi
/
resources
/
rsmisc.c
diff --git
a/drivers/acpi/resources/rsmisc.c
b/drivers/acpi/resources/rsmisc.c
index faf6e106b78502bbd7a9c648cdbcabb0711bb95c..de1ac3881b224ab1121a5edd97409aecf7831071 100644
(file)
--- a/
drivers/acpi/resources/rsmisc.c
+++ b/
drivers/acpi/resources/rsmisc.c
@@
-5,7
+5,7
@@
******************************************************************************/
/*
******************************************************************************/
/*
- * Copyright (C) 2000 - 200
6, R. Byron Moore
+ * Copyright (C) 2000 - 200
8, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@
-46,7
+46,6
@@
#define _COMPONENT ACPI_RESOURCES
ACPI_MODULE_NAME("rsmisc")
#define _COMPONENT ACPI_RESOURCES
ACPI_MODULE_NAME("rsmisc")
-
#define INIT_RESOURCE_TYPE(i) i->resource_offset
#define INIT_RESOURCE_LENGTH(i) i->aml_offset
#define INIT_TABLE_LENGTH(i) i->value
#define INIT_RESOURCE_TYPE(i) i->resource_offset
#define INIT_RESOURCE_LENGTH(i) i->aml_offset
#define INIT_TABLE_LENGTH(i) i->value
@@
-429,8
+428,7
@@
acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
* Optional resource_source (Index and String)
*/
aml_length =
* Optional resource_source (Index and String)
*/
aml_length =
- acpi_rs_set_resource_source(aml,
- (acpi_rs_length)
+ acpi_rs_set_resource_source(aml, (acpi_rs_length)
aml_length, source);
acpi_rs_set_resource_length(aml_length, aml);
break;
aml_length, source);
acpi_rs_set_resource_length(aml_length, aml);
break;
@@
-499,6
+497,17
@@
acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
}
break;
}
break;
+ case ACPI_RSC_EXIT_EQ:
+ /*
+ * Control - Exit conversion if equal
+ */
+ if (*ACPI_ADD_PTR(u8, resource,
+ COMPARE_TARGET(info)) ==
+ COMPARE_VALUE(info)) {
+ goto exit;
+ }
+ break;
+
default:
ACPI_ERROR((AE_INFO, "Invalid conversion opcode"));
default:
ACPI_ERROR((AE_INFO, "Invalid conversion opcode"));
This page took
0.028423 seconds
and
5
git commands to generate.