diff --git a/[refs] b/[refs]
index 98780fc7d10f..ad2bc8d6194d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b7018aae7e1798f55f736b9a77c201708aa0e33
+refs/heads/master: c4febb94dae915da4423b81c487eabed9cef5cba
diff --git a/trunk/drivers/input/touchscreen/ads7846.c b/trunk/drivers/input/touchscreen/ads7846.c
index 8670cd13bd5d..bdec112e89c4 100644
--- a/trunk/drivers/input/touchscreen/ads7846.c
+++ b/trunk/drivers/input/touchscreen/ads7846.c
@@ -449,7 +449,7 @@ ads7846_suspend(struct spi_device *spi, pm_message_t message)
 
 		while (ts->pendown || ts->pending) {
 			spin_unlock_irqrestore(&ts->lock, flags);
-			udelay(10);
+			msleep(1);
 			spin_lock_irqsave(&ts->lock, flags);
 		}
 	}