aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/acpi/ec.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 63e0ac2644ad..1a7949c757b3 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -248,9 +248,9 @@ static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, int force_poll)
248 udelay(ACPI_EC_UDELAY); 248 udelay(ACPI_EC_UDELAY);
249 } 249 }
250 } 250 }
251 pr_err(PREFIX "acpi_ec_wait timeout," 251 pr_err(PREFIX "acpi_ec_wait timeout, status = 0x%2.2x, event = %s\n",
252 " status = %d, expect_event = %d\n", 252 acpi_ec_read_status(ec),
253 acpi_ec_read_status(ec), event); 253 (event == ACPI_EC_EVENT_OBF_1) ? "\"b0=1\"" : "\"b1=0\"");
254 ret = -ETIME; 254 ret = -ETIME;
255 end: 255 end:
256 clear_bit(EC_FLAGS_ADDRESS, &ec->flags); 256 clear_bit(EC_FLAGS_ADDRESS, &ec->flags);
@@ -264,8 +264,8 @@ static int acpi_ec_transaction_unlocked(struct acpi_ec *ec, u8 command,
264{ 264{
265 int result = 0; 265 int result = 0;
266 set_bit(EC_FLAGS_WAIT_GPE, &ec->flags); 266 set_bit(EC_FLAGS_WAIT_GPE, &ec->flags);
267 acpi_ec_write_cmd(ec, command);
268 pr_debug(PREFIX "transaction start\n"); 267 pr_debug(PREFIX "transaction start\n");
268 acpi_ec_write_cmd(ec, command);
269 for (; wdata_len > 0; --wdata_len) { 269 for (; wdata_len > 0; --wdata_len) {
270 result = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0, force_poll); 270 result = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0, force_poll);
271 if (result) { 271 if (result) {