summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcelo Tosatti <marcelo@kvack.org>2007-08-17 06:03:22 +0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-08-20 17:18:05 +0200
commit70cd685d4b161c9137020ba7ec551cb343cd6fbf (patch)
tree263742028d02b0e195a52268dad8139fb11a033c
parentV4L/DVB (6027): Get rid of an ill-behaved msleep in i2c write (diff)
downloadlinux-70cd685d4b161c9137020ba7ec551cb343cd6fbf.tar.xz
linux-70cd685d4b161c9137020ba7ec551cb343cd6fbf.zip
V4L/DVB (6028): Turn an unnecessary mdelay() into msleep().
Signed-off-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/video/cafe_ccic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index acf64b19730e..ef5361824f87 100644
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -730,7 +730,7 @@ static void cafe_ctlr_init(struct cafe_camera *cam)
* Here we must wait a bit for the controller to come around.
*/
spin_unlock_irqrestore(&cam->dev_lock, flags);
- mdelay(5); /* FIXME revisit this */
+ msleep(5);
spin_lock_irqsave(&cam->dev_lock, flags);
cafe_reg_write(cam, REG_GL_CSR, GCSR_CCIC_EN|GCSR_SRC|GCSR_MRC);