diff --git a/[refs] b/[refs]
index a0fb50d220ea..fef27ee02a42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff388f270d926d95d70e5b3d373c9cb97b38c8b1
+refs/heads/master: 2232e238295d8ea707fe4271ffbfd4f32346aa81
diff --git a/trunk/sound/oss/au1550_ac97.c b/trunk/sound/oss/au1550_ac97.c
index 0fd256ceea6b..c4a4cdc07ab9 100644
--- a/trunk/sound/oss/au1550_ac97.c
+++ b/trunk/sound/oss/au1550_ac97.c
@@ -163,19 +163,10 @@ ld2(unsigned int x)
 static void
 au1550_delay(int msec)
 {
-	unsigned long   tmo;
-	signed long     tmo2;
-
 	if (in_interrupt())
 		return;
 
-	tmo = jiffies + (msec * HZ) / 1000;
-	for (;;) {
-		tmo2 = tmo - jiffies;
-		if (tmo2 <= 0)
-			break;
-		schedule_timeout(tmo2);
-	}
+	schedule_timeout_uninterruptible(msecs_to_jiffies(msec));
 }
 
 static u16