diff options
-rw-r--r-- | drivers/acpi/ec.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 50d55fe71a30..41a21fcdbcb8 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
@@ -258,9 +258,6 @@ static int acpi_ec_transaction(struct acpi_ec *ec, u8 command, | |||
258 | } | 258 | } |
259 | } | 259 | } |
260 | 260 | ||
261 | /* Make sure GPE is enabled before doing transaction */ | ||
262 | acpi_enable_gpe(NULL, ec->gpe, ACPI_NOT_ISR); | ||
263 | |||
264 | status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0, 0); | 261 | status = acpi_ec_wait(ec, ACPI_EC_EVENT_IBF_0, 0); |
265 | if (status) { | 262 | if (status) { |
266 | printk(KERN_ERR PREFIX | 263 | printk(KERN_ERR PREFIX |
@@ -638,12 +635,10 @@ static struct acpi_ec *make_acpi_ec(void) | |||
638 | struct acpi_ec *ec = kzalloc(sizeof(struct acpi_ec), GFP_KERNEL); | 635 | struct acpi_ec *ec = kzalloc(sizeof(struct acpi_ec), GFP_KERNEL); |
639 | if (!ec) | 636 | if (!ec) |
640 | return NULL; | 637 | return NULL; |
641 | |||
642 | ec->flags = 1 << EC_FLAGS_QUERY_PENDING; | 638 | ec->flags = 1 << EC_FLAGS_QUERY_PENDING; |
643 | mutex_init(&ec->lock); | 639 | mutex_init(&ec->lock); |
644 | init_waitqueue_head(&ec->wait); | 640 | init_waitqueue_head(&ec->wait); |
645 | INIT_LIST_HEAD(&ec->list); | 641 | INIT_LIST_HEAD(&ec->list); |
646 | |||
647 | return ec; | 642 | return ec; |
648 | } | 643 | } |
649 | 644 | ||