applied to acpi tree, ec branch.
thanks,
-len
On Thu, 16 Oct 2008, Alexey Starikovskiy wrote:
> Signed-off-by: Alexey Starikovskiy <astarikovskiy@xxxxxxx>
> ---
>
> drivers/acpi/ec.c | 15 +++++++++++++--
> 1 files changed, 13 insertions(+), 2 deletions(-)
>
>
> diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
> index 69f5f78..f9c0782 100644
> --- a/drivers/acpi/ec.c
> +++ b/drivers/acpi/ec.c
> @@ -300,6 +300,18 @@ static int ec_check_ibf0(struct acpi_ec *ec)
> 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,
> int force_poll)
> {
> @@ -317,8 +329,7 @@ static int acpi_ec_transaction(struct acpi_ec *ec, struct transaction *t,
> goto unlock;
> }
> }
> - if (!wait_event_timeout(ec->wait, ec_check_ibf0(ec),
> - msecs_to_jiffies(ACPI_EC_DELAY))) {
> + if (ec_wait_ibf0(ec)) {
> pr_err(PREFIX "input buffer is not empty, "
> "aborting transaction\n");
> status = -ETIME;
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
