The only udelay() call takes place in a sleepable context, we can sleep
instead. Use usleep_range().

Signed-off-by: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
---
 drivers/staging/media/omap4iss/iss.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/media/omap4iss/iss.c 
b/drivers/staging/media/omap4iss/iss.c
index 320bfd4..3103093 100644
--- a/drivers/staging/media/omap4iss/iss.c
+++ b/drivers/staging/media/omap4iss/iss.c
@@ -642,11 +642,11 @@ static int iss_reset(struct iss_device *iss)
 
        while (readl(iss->regs[OMAP4_ISS_MEM_TOP] + ISS_HL_SYSCONFIG) &
                        ISS_HL_SYSCONFIG_SOFTRESET) {
-               if (timeout++ > 10000) {
+               if (timeout++ > 100) {
                        dev_alert(iss->dev, "cannot reset ISS\n");
                        return -ETIMEDOUT;
                }
-               udelay(1);
+               usleep_range(10, 10);
        }
 
        return 0;
@@ -674,7 +674,7 @@ static int iss_isp_reset(struct iss_device *iss)
                        dev_alert(iss->dev, "cannot set ISP5 to standby\n");
                        return -ETIMEDOUT;
                }
-               msleep(1);
+               usleep_range(1000, 1500);
        }
 
        /* Now finally, do the reset */
@@ -689,7 +689,7 @@ static int iss_isp_reset(struct iss_device *iss)
                        dev_alert(iss->dev, "cannot reset ISP5\n");
                        return -ETIMEDOUT;
                }
-               msleep(1);
+               usleep_range(1000, 1500);
        }
 
        return 0;
-- 
1.8.1.5

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to