korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-23 02:54:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

ACPI: ec: Query only single query at a time.

Browse Source 
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Alexey Starikovskiy 2006-12-07 18:42:16 +03:00 committed by Len Brown
parent e41334c0a6
commit 5d0c288b73
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/acpi/ec.c
View File

@ -104,6 +104,7 @@ struct acpi_ec {
unsigned long data_addr;
unsigned long global_lock;
struct semaphore sem;
atomic_t query_pending;
atomic_t leaving_burst; /* 0 : No, 1 : Yes, 2: abort */
wait_queue_head_t wait;
} *ec_ecdt;
@ -257,6 +258,8 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command,
command);
goto end;
}
} else if (command == ACPI_EC_COMMAND_QUERY) {
atomic_set(&ec->query_pending, 0);
}
for (; rdata_len > 0; rdata_len --) {
@ -425,17 +428,9 @@ static void acpi_ec_gpe_query(void *ec_cxt)
{
struct acpi_ec *ec = (struct acpi_ec *)ec_cxt;
u8 value = 0;
static char object_name[8];
char object_name[8];
if (!ec)
return;
value = acpi_ec_read_status(ec);
if (!(value & ACPI_EC_FLAG_SCI))
return;
if (acpi_ec_query(ec, &value))
if (!ec || acpi_ec_query(ec, &value))
return;
snprintf(object_name, 8, "_Q%2.2X", value);
@ -457,7 +452,8 @@ static u32 acpi_ec_gpe_handler(void *data)
}
value = acpi_ec_read_status(ec);
if (value & ACPI_EC_FLAG_SCI) {
if ((value & ACPI_EC_FLAG_SCI) && !atomic_read(&ec->query_pending)) {
atomic_set(&ec->query_pending, 1);
status = acpi_os_execute(OSL_EC_BURST_HANDLER, acpi_ec_gpe_query, ec);
}
@ -652,6 +648,7 @@ static int acpi_ec_add(struct acpi_device *device)
ec->handle = device->handle;
ec->uid = -1;
init_MUTEX(&ec->sem);
atomic_set(&ec->query_pending, 0);
if (acpi_ec_mode == EC_INTR) {
atomic_set(&ec->leaving_burst, 1);
init_waitqueue_head(&ec->wait);