diff --git a/[refs] b/[refs]
index eb75f26fff59..66bd6c20ebd8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6304933274f8e3cc6983d496456757ac8ab2e0b
+refs/heads/master: 6292b9ef5a4e85d6b782412a85725dd38df24b85
diff --git a/trunk/drivers/s390/char/tape_std.c b/trunk/drivers/s390/char/tape_std.c
index 1a9420ba518d..750354ad16e5 100644
--- a/trunk/drivers/s390/char/tape_std.c
+++ b/trunk/drivers/s390/char/tape_std.c
@@ -68,7 +68,7 @@ tape_std_assign(struct tape_device *device)
 	 * to another host (actually this shouldn't happen but it does).
 	 * So we set up a timeout for this call.
 	 */
-	init_timer(&timeout);
+	init_timer_on_stack(&timeout);
 	timeout.function = tape_std_assign_timeout;
 	timeout.data     = (unsigned long) request;
 	timeout.expires  = jiffies + 2 * HZ;