diff options
| author | Evan Wilson <evan@oliodevices.com> | 2016-01-20 02:10:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@ip-172-31-25-77.us-west-1.compute.internal> | 2015-04-16 10:08:13 +0000 |
| commit | 058e418668659a82ae277b05dc1fc1a546aa3bc8 (patch) | |
| tree | 84dd0edeb63c32b667577d42e3c2823876c69942 /drivers/i2c/busses/i2c-omap.c | |
| parent | 7a919b1fe2429b091d2c983ed554b431d3828abf (diff) | |
| parent | adacad29a479dff5c4959e11f59ed2623faa455a (diff) | |
| download | olio-linux-3.10-058e418668659a82ae277b05dc1fc1a546aa3bc8.tar.xz olio-linux-3.10-058e418668659a82ae277b05dc1fc1a546aa3bc8.zip | |
Merge "Enable/disable fuel gauge wake up depending on charge state. This turns off interrupts from the fuel gauge while charging." into android-3.10-bringup
Diffstat (limited to 'drivers/i2c/busses/i2c-omap.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-omap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 0e15ad357aa..00fb5ac811c 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -690,7 +690,7 @@ omap_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) r = omap_i2c_wait_for_bb(dev); /* If timeout, try to again check after attempting to clear the bus */ - if (WARN_ON(r == -ETIMEDOUT)) { + if (r == -ETIMEDOUT) { /* removed WARN_ON here, too much output from ts81001 */ r = omap_i2c_bus_clear(dev); if (r < 0) { dev_err(dev->dev, "Unable to recover i2c bus from bb\n"); |