diff options
| author | Kyle McMartin <kyle@mcmartin.ca> | 2010-11-02 13:06:42 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@mcmartin.ca> | 2010-11-02 13:06:42 -0400 |
| commit | 7b2f649ec2da6640878c15298f5d3f8451dd8125 (patch) | |
| tree | b26440ffa8853847fa0625f932673c7ff2554f2c /acpi-ec-add-delay-before-write.patch | |
| parent | 3daa57b3d93c5d0a795e3446850c83483df37f2e (diff) | |
| download | kernel-7b2f649ec2da6640878c15298f5d3f8451dd8125.tar.gz kernel-7b2f649ec2da6640878c15298f5d3f8451dd8125.tar.xz kernel-7b2f649ec2da6640878c15298f5d3f8451dd8125.zip | |
Linux 2.6.37-rc1
Diffstat (limited to 'acpi-ec-add-delay-before-write.patch')
| -rw-r--r-- | acpi-ec-add-delay-before-write.patch | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/acpi-ec-add-delay-before-write.patch b/acpi-ec-add-delay-before-write.patch index af49cccbd..f1cb50817 100644 --- a/acpi-ec-add-delay-before-write.patch +++ b/acpi-ec-add-delay-before-write.patch @@ -23,7 +23,7 @@ index 27e0b92..09fbb69 100644 pr_debug(PREFIX "controller reset, restart transaction\n"); spin_lock_irqsave(&ec->curr_lock, flags); start_transaction(ec); -@@ -271,15 +272,25 @@ static int ec_check_ibf0(struct acpi_ec *ec) +@@ -271,15 +272,24 @@ static int ec_check_ibf0(struct acpi_ec *ec) return (status & ACPI_EC_FLAG_IBF) == 0; } @@ -38,8 +38,7 @@ index 27e0b92..09fbb69 100644 + static int ec_wait_ibf0(struct acpi_ec *ec) { -+ - unsigned long delay = jiffies + msecs_to_jiffies(ACPI_EC_DELAY); + unsigned long delay = jiffies + msecs_to_jiffies(ec_delay); /* interrupt wait manually if GPE mode is not active */ while (time_before(jiffies, delay)) if (wait_event_timeout(ec->wait, ec_check_ibf0(ec), |