mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-07 00:59:06 +00:00
Code Issues Releases Wiki Activity

ACPI: EC: Check for IBF=0 periodically if not in GPE mode

Browse source 
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Tested-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Alexey Starikovskiy 2008-10-16 02:02:33 +04:00 committed by Len Brown
parent 455c8793d2
commit c0ff17720e
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/acpi/ec.c
View file

@ -298,6 +298,18 @@ static int ec_check_ibf0(struct acpi_ec *ec)
return (status & ACPI_EC_FLAG_IBF) == 0; return (status & ACPI_EC_FLAG_IBF) == 0;
} }
static int ec_wait_ibf0(struct acpi_ec *ec)
{
unsigned long delay = jiffies + msecs_to_jiffies(ACPI_EC_DELAY);
/* interrupt wait manually if GPE mode is not active */
unsigned long timeout = test_bit(EC_FLAGS_GPE_MODE, &ec->flags) ?
msecs_to_jiffies(ACPI_EC_DELAY) : msecs_to_jiffies(1);
while (time_before(jiffies, delay))
if (wait_event_timeout(ec->wait, ec_check_ibf0(ec), timeout))
return 0;
return -ETIME;
}
static int acpi_ec_transaction(struct acpi_ec *ec, struct transaction *t, static int acpi_ec_transaction(struct acpi_ec *ec, struct transaction *t,
int force_poll) int force_poll)
{ {
@ -315,8 +327,7 @@ static int acpi_ec_transaction(struct acpi_ec *ec, struct transaction *t,
goto unlock; goto unlock;
} }
} }
if (!wait_event_timeout(ec->wait, ec_check_ibf0(ec), if (ec_wait_ibf0(ec)) {
msecs_to_jiffies(ACPI_EC_DELAY))) {
pr_err(PREFIX "input buffer is not empty, " pr_err(PREFIX "input buffer is not empty, "
"aborting transaction\n"); "aborting transaction\n");
status = -ETIME; status = -ETIME;