Message ID | 1352969361-10521-1-git-send-email-shubhrajyoti@ti.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Thu, Nov 15, 2012 at 02:19:21PM +0530, Shubhrajyoti D wrote: > Currently we just queue the transfer and release the > qos constraints, however we do not wait for the transfer > to complete to release the constraint. Move the remove > constraint after the bus busy as we are sure that the > transfers are completed by then. > > Acked-by: Jean Pihet <j-pihet@ti.com> > Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com> Applied to for-next. Please let me know if it should go to for-current.
On Fri, Nov 16, 2012 at 7:50 PM, Wolfram Sang <w.sang@pengutronix.de> wrote: > On Thu, Nov 15, 2012 at 02:19:21PM +0530, Shubhrajyoti D wrote: >> Currently we just queue the transfer and release the >> qos constraints, however we do not wait for the transfer >> to complete to release the constraint. Move the remove >> constraint after the bus busy as we are sure that the >> transfers are completed by then. >> >> Acked-by: Jean Pihet <j-pihet@ti.com> >> Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com> > > Applied to for-next. Please let me know if it should go to for-current. I feel for-next should be fine. > > -- > Pengutronix e.K. | Wolfram Sang | > Industrial Linux Solutions | http://www.pengutronix.de/ | -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 482c63d..fabcbe1 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -654,13 +654,14 @@ omap_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) break; } - if (dev->set_mpu_wkup_lat != NULL) - dev->set_mpu_wkup_lat(dev->dev, -1); - if (r == 0) r = num; omap_i2c_wait_for_bb(dev); + + if (dev->set_mpu_wkup_lat != NULL) + dev->set_mpu_wkup_lat(dev->dev, -1); + out: pm_runtime_mark_last_busy(dev->dev); pm_runtime_put_autosuspend(dev->dev);