diff --git a/[refs] b/[refs] index 83fdf2279717..a9a328321299 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 080e412cc0bdb9ef8e7a983d5e008537e1c4d36c +refs/heads/master: 0c5d31f48e54b2e56e9cef8d49ffedaef1e0ea52 diff --git a/trunk/drivers/acpi/ec.c b/trunk/drivers/acpi/ec.c index 08fbe62a2db4..5ce90ce22b58 100644 --- a/trunk/drivers/acpi/ec.c +++ b/trunk/drivers/acpi/ec.c @@ -228,7 +228,9 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command, command); goto end; } - set_bit(EC_FLAGS_WAIT_GPE, &ec->flags); + /* Don't expect GPE after last read */ + if (rdata_len > 1) + set_bit(EC_FLAGS_WAIT_GPE, &ec->flags); *(rdata++) = acpi_ec_read_data(ec); } end: