git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
acpi
/
parser
/
psopcode.c
diff --git
a/drivers/acpi/parser/psopcode.c
b/drivers/acpi/parser/psopcode.c
index
11d6351
..
4bd25e3
100644
(file)
--- a/
drivers/acpi/parser/psopcode.c
+++ b/
drivers/acpi/parser/psopcode.c
@@
-725,12
+725,13
@@
static const u8 acpi_gbl_long_op_index[NUM_EXTENDED_OPCODE] = {
const struct acpi_opcode_info *acpi_ps_get_opcode_info(u16 opcode)
{
const struct acpi_opcode_info *acpi_ps_get_opcode_info(u16 opcode)
{
- ACPI_FUNCTION_NAME(
"ps_get_opcode_info"
);
+ ACPI_FUNCTION_NAME(
ps_get_opcode_info
);
/*
* Detect normal 8-bit opcode or extended 16-bit opcode
*/
if (!(opcode & 0xFF00)) {
/*
* Detect normal 8-bit opcode or extended 16-bit opcode
*/
if (!(opcode & 0xFF00)) {
+
/* Simple (8-bit) opcode: 0-255, can't index beyond table */
return (&acpi_gbl_aml_op_info
/* Simple (8-bit) opcode: 0-255, can't index beyond table */
return (&acpi_gbl_aml_op_info
@@
-739,6
+740,7
@@
const struct acpi_opcode_info *acpi_ps_get_opcode_info(u16 opcode)
if (((opcode & 0xFF00) == AML_EXTENDED_OPCODE) &&
(((u8) opcode) <= MAX_EXTENDED_OPCODE)) {
if (((opcode & 0xFF00) == AML_EXTENDED_OPCODE) &&
(((u8) opcode) <= MAX_EXTENDED_OPCODE)) {
+
/* Valid extended (16-bit) opcode */
return (&acpi_gbl_aml_op_info
/* Valid extended (16-bit) opcode */
return (&acpi_gbl_aml_op_info
@@
-779,7
+781,7
@@
char *acpi_ps_get_opcode_name(u16 opcode)
return (op->name);
#else
return (op->name);
#else
- return ("
AE_NOT_CONFIGURED
");
+ return ("
OpcodeName unavailable
");
#endif
}
#endif
}