Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 276803
b: refs/heads/master
c: 1d5a34f
h: refs/heads/master
i:
  276801: 3981a22
  276799: c0aa65c
v: v3
  • Loading branch information
Shubhrajyoti D authored and Ben Dooks committed Dec 18, 2011
1 parent ac99492 commit 22436fa
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8ebe661dd2ab16e2e9c272ed5c86019c7407b9a1
refs/heads/master: 1d5a34fe990c9e2e2f672b238ad881d0d4ed376b
11 changes: 6 additions & 5 deletions trunk/drivers/i2c/busses/i2c-omap.c
Original file line number Diff line number Diff line change
Expand Up @@ -1047,13 +1047,14 @@ omap_i2c_probe(struct platform_device *pdev)
* size. This is to ensure that we can handle the status on int
* call back latencies.
*/
if (dev->rev >= OMAP_I2C_REV_ON_3530_4430) {
dev->fifo_size = 0;

dev->fifo_size = (dev->fifo_size / 2);

if (dev->rev >= OMAP_I2C_REV_ON_3530_4430)
dev->b_hw = 0; /* Disable hardware fixes */
} else {
dev->fifo_size = (dev->fifo_size / 2);
else
dev->b_hw = 1; /* Enable hardware fixes */
}

/* calculate wakeup latency constraint for MPU */
if (dev->set_mpu_wkup_lat != NULL)
dev->latency = (1000000 * dev->fifo_size) /
Expand Down

0 comments on commit 22436fa

Please sign in to comment.