On Tue, Feb 10, 2015 at 07:06:10PM +0200, Andy Shevchenko wrote: > This patch marks baytrail_i2c_acquire() that it might sleep. Also it chages > while-loop to do-while and, though it is matter of taste, gives a chance to > check one more time before report a timeout. > > Signed-off-by: Andy Shevchenko <[email protected]>
Acked-by: David E. Box <[email protected]> > --- > drivers/i2c/busses/i2c-designware-baytrail.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-designware-baytrail.c > b/drivers/i2c/busses/i2c-designware-baytrail.c > index 036d9bdc0..7d7ae97 100644 > --- a/drivers/i2c/busses/i2c-designware-baytrail.c > +++ b/drivers/i2c/busses/i2c-designware-baytrail.c > @@ -68,6 +68,8 @@ static int baytrail_i2c_acquire(struct dw_i2c_dev *dev) > int ret; > unsigned long start, end; > > + might_sleep(); > + > if (!dev || !dev->dev) > return -ENODEV; > > @@ -85,7 +87,7 @@ static int baytrail_i2c_acquire(struct dw_i2c_dev *dev) > /* host driver waits for bit 0 to be set in semaphore register */ > start = jiffies; > end = start + msecs_to_jiffies(SEMAPHORE_TIMEOUT); > - while (!time_after(jiffies, end)) { > + do { > ret = get_sem(dev->dev, &sem); > if (!ret && sem) { > acquired = jiffies; > @@ -95,7 +97,7 @@ static int baytrail_i2c_acquire(struct dw_i2c_dev *dev) > } > > usleep_range(1000, 2000); > - } > + } while (time_before(jiffies, end)); > > dev_err(dev->dev, "punit semaphore timed out, resetting\n"); > reset_semaphore(dev->dev); > -- > 2.1.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
