From 6f6c76c96ba04fa7c1bea73bc872f091b5095073 Mon Sep 17 00:00:00 2001
From: Jean-Francois Moine <moinejf@free.fr>
Date: Mon, 24 Nov 2008 06:38:21 -0300
Subject: [PATCH] --- yaml --- r: 124360 b: refs/heads/master c:
 abf485fe5136c4f828df2d07655d6dc7253894a5 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/media/video/gspca/gspca.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f21b8e96a050..9729ac7eadf5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8843765e28f0eeb0510edb0cc3037d9e1dffd6a6
+refs/heads/master: abf485fe5136c4f828df2d07655d6dc7253894a5
diff --git a/trunk/drivers/media/video/gspca/gspca.c b/trunk/drivers/media/video/gspca/gspca.c
index 9b71059521f9..6d924f180696 100644
--- a/trunk/drivers/media/video/gspca/gspca.c
+++ b/trunk/drivers/media/video/gspca/gspca.c
@@ -640,7 +640,7 @@ static int gspca_init_transfer(struct gspca_dev *gspca_dev)
 				gspca_dev->streaming = 0;
 				destroy_urbs(gspca_dev);
 				if (ret == -ENOSPC) {
-					mdelay(20);	/* wait for kill
+					msleep(20);	/* wait for kill
 							 * complete */
 					break;	/* try the previous alt */
 				}