aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/blacklist.c
diff options
context:
space:
mode:
authorAlexey Starikovskiy <alexey.y.starikovskiy@intel.com>2007-02-02 11:48:22 -0500
committerLen Brown <len.brown@intel.com>2007-02-02 21:14:29 -0500
commit428f211297bc95fd41f23830eab4180339020dd0 (patch)
tree81537f25f9add9e727e9d764fdcb333a1af07528 /drivers/acpi/blacklist.c
parent77f6a9fca39f4f19d2d9d5fff1ff5c2ccf20629c (diff)
ACPICA: Miscellaneous table manager updates and optimizations
Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/blacklist.c')
-rw-r--r--drivers/acpi/blacklist.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index c8f4cac9d84d..f289fd41e77d 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -103,7 +103,7 @@ int __init acpi_blacklisted(void)
103{ 103{
104 int i = 0; 104 int i = 0;
105 int blacklisted = 0; 105 int blacklisted = 0;
106 struct acpi_table_header *table_header; 106 struct acpi_table_header table_header;
107 107
108 while (acpi_blacklist[i].oem_id[0] != '\0') { 108 while (acpi_blacklist[i].oem_id[0] != '\0') {
109 if (acpi_get_table_header(acpi_blacklist[i].table, 0, &table_header)) { 109 if (acpi_get_table_header(acpi_blacklist[i].table, 0, &table_header)) {
@@ -111,13 +111,13 @@ int __init acpi_blacklisted(void)
111 continue; 111 continue;
112 } 112 }
113 113
114 if (strncmp(acpi_blacklist[i].oem_id, table_header->oem_id, 6)) { 114 if (strncmp(acpi_blacklist[i].oem_id, table_header.oem_id, 6)) {
115 i++; 115 i++;
116 continue; 116 continue;
117 } 117 }
118 118
119 if (strncmp 119 if (strncmp
120 (acpi_blacklist[i].oem_table_id, table_header->oem_table_id, 120 (acpi_blacklist[i].oem_table_id, table_header.oem_table_id,
121 8)) { 121 8)) {
122 i++; 122 i++;
123 continue; 123 continue;
@@ -126,14 +126,14 @@ int __init acpi_blacklisted(void)
126 if ((acpi_blacklist[i].oem_revision_predicate == all_versions) 126 if ((acpi_blacklist[i].oem_revision_predicate == all_versions)
127 || (acpi_blacklist[i].oem_revision_predicate == 127 || (acpi_blacklist[i].oem_revision_predicate ==
128 less_than_or_equal 128 less_than_or_equal
129 && table_header->oem_revision <= 129 && table_header.oem_revision <=
130 acpi_blacklist[i].oem_revision) 130 acpi_blacklist[i].oem_revision)
131 || (acpi_blacklist[i].oem_revision_predicate == 131 || (acpi_blacklist[i].oem_revision_predicate ==
132 greater_than_or_equal 132 greater_than_or_equal
133 && table_header->oem_revision >= 133 && table_header.oem_revision >=
134 acpi_blacklist[i].oem_revision) 134 acpi_blacklist[i].oem_revision)
135 || (acpi_blacklist[i].oem_revision_predicate == equal 135 || (acpi_blacklist[i].oem_revision_predicate == equal
136 && table_header->oem_revision == 136 && table_header.oem_revision ==
137 acpi_blacklist[i].oem_revision)) { 137 acpi_blacklist[i].oem_revision)) {
138 138
139 printk(KERN_ERR PREFIX 139 printk(KERN_ERR PREFIX