aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/system.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/system.c')
-rw-r--r--drivers/acpi/system.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c
index 407b0e0281db..7147b0bdab0a 100644
--- a/drivers/acpi/system.c
+++ b/drivers/acpi/system.c
@@ -44,7 +44,6 @@ ACPI_MODULE_NAME("acpi_system")
44#define ACPI_SYSTEM_FILE_EVENT "event" 44#define ACPI_SYSTEM_FILE_EVENT "event"
45#define ACPI_SYSTEM_FILE_DSDT "dsdt" 45#define ACPI_SYSTEM_FILE_DSDT "dsdt"
46#define ACPI_SYSTEM_FILE_FADT "fadt" 46#define ACPI_SYSTEM_FILE_FADT "fadt"
47extern struct fadt_descriptor acpi_fadt;
48 47
49/* 48/*
50 * Make ACPICA version work as module param 49 * Make ACPICA version work as module param
@@ -96,17 +95,16 @@ acpi_system_read_dsdt(struct file *file,
96 char __user * buffer, size_t count, loff_t * ppos) 95 char __user * buffer, size_t count, loff_t * ppos)
97{ 96{
98 acpi_status status = AE_OK; 97 acpi_status status = AE_OK;
99 struct acpi_buffer dsdt = { ACPI_ALLOCATE_BUFFER, NULL }; 98 struct acpi_table_header *dsdt = NULL;
100 ssize_t res; 99 ssize_t res;
101 100
102 101
103 status = acpi_get_table(ACPI_TABLE_ID_DSDT, 1, &dsdt); 102 status = acpi_get_table(ACPI_SIG_DSDT, 1, &dsdt);
104 if (ACPI_FAILURE(status)) 103 if (ACPI_FAILURE(status))
105 return -ENODEV; 104 return -ENODEV;
106 105
107 res = simple_read_from_buffer(buffer, count, ppos, 106 res = simple_read_from_buffer(buffer, count, ppos,
108 dsdt.pointer, dsdt.length); 107 dsdt, dsdt->length);
109 kfree(dsdt.pointer);
110 108
111 return res; 109 return res;
112} 110}
@@ -123,17 +121,16 @@ acpi_system_read_fadt(struct file *file,
123 char __user * buffer, size_t count, loff_t * ppos) 121 char __user * buffer, size_t count, loff_t * ppos)
124{ 122{
125 acpi_status status = AE_OK; 123 acpi_status status = AE_OK;
126 struct acpi_buffer fadt = { ACPI_ALLOCATE_BUFFER, NULL }; 124 struct acpi_table_header *fadt = NULL;
127 ssize_t res; 125 ssize_t res;
128 126
129 127
130 status = acpi_get_table(ACPI_TABLE_ID_FADT, 1, &fadt); 128 status = acpi_get_table(ACPI_SIG_FADT, 1, &fadt);
131 if (ACPI_FAILURE(status)) 129 if (ACPI_FAILURE(status))
132 return -ENODEV; 130 return -ENODEV;
133 131
134 res = simple_read_from_buffer(buffer, count, ppos, 132 res = simple_read_from_buffer(buffer, count, ppos,
135 fadt.pointer, fadt.length); 133 fadt, fadt->length);
136 kfree(fadt.pointer);
137 134
138 return res; 135 return res;
139} 136}