aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMarcelo Tosatti <marcelo@kvack.org>2007-08-17 00:03:22 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-08-20 11:18:05 -0400
commit70cd685d4b161c9137020ba7ec551cb343cd6fbf (patch)
tree263742028d02b0e195a52268dad8139fb11a033c /drivers/media
parent6d77444aca298b43a88086be446f943cd0442ef7 (diff)
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>
Diffstat (limited to 'drivers/media')
-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)
730 * Here we must wait a bit for the controller to come around. 730 * Here we must wait a bit for the controller to come around.
731 */ 731 */
732 spin_unlock_irqrestore(&cam->dev_lock, flags); 732 spin_unlock_irqrestore(&cam->dev_lock, flags);
733 mdelay(5); /* FIXME revisit this */ 733 msleep(5);
734 spin_lock_irqsave(&cam->dev_lock, flags); 734 spin_lock_irqsave(&cam->dev_lock, flags);
735 735
736 cafe_reg_write(cam, REG_GL_CSR, GCSR_CCIC_EN|GCSR_SRC|GCSR_MRC); 736 cafe_reg_write(cam, REG_GL_CSR, GCSR_CCIC_EN|GCSR_SRC|GCSR_MRC);