git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From foo@baz Sun Dec 14 12:04:52 PST 2014
   2 Date: Sun, 14 Dec 2014 12:04:52 -0800
   3 To: Greg KH <gregkh@linuxfoundation.org>
   4 From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   5 Subject: Revert: ACPI / EC: Add support to disallow QR_EC to be issued before completing previous QR_EC
   6
   7 This reverts commit 2dbfff81a40b5b2be553042ad5c767e34fdd214c, which
   8 really is commit 558e4736f2e1b0e6323adf7a5e4df77ed6cfc1a4 upstream.
   9
  10 Sorry for the confusion, this got applied twice, and reverted once, this
  11 is the second revert and I hope to never touch it again...
  12
  13 Reported-by: Lv Zheng <lv.zheng@intel.com>
  14 Cc: Alexander Mezin <mezin.alexander@gmail.com>
  15 Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  16 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  17
  18 ---
  19  drivers/acpi/ec.c |    4 ++--
  20  1 file changed, 2 insertions(+), 2 deletions(-)
  21
  22 --- a/drivers/acpi/ec.c
  23 +++ b/drivers/acpi/ec.c
  24 @@ -299,11 +299,11 @@ static int acpi_ec_transaction_unlocked(
  25         /* following two actions should be kept atomic */
  26         ec->curr = t;
  27         start_transaction(ec);
  28 -       if (ec->curr->command == ACPI_EC_COMMAND_QUERY)
  29 -               clear_bit(EC_FLAGS_QUERY_PENDING, &ec->flags);
  30         spin_unlock_irqrestore(&ec->lock, tmp);
  31         ret = ec_poll(ec);
  32         spin_lock_irqsave(&ec->lock, tmp);
  33 +       if (ec->curr->command == ACPI_EC_COMMAND_QUERY)
  34 +               clear_bit(EC_FLAGS_QUERY_PENDING, &ec->flags);
  35         ec->curr = NULL;
  36         spin_unlock_irqrestore(&ec->lock, tmp);
  37         return ret;