Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[karo-tx-linux.git] / drivers / s390 / char / tape_std.c

diff --git a/drivers/s390/char/tape_std.c b/drivers/s390/char/tape_std.c
index 1a9420ba518d66cb767bba6d1b9d0e8cd4d3dc7b..750354ad16e5506cb6628304462036cc96482df8 100644 (file)
--- a/drivers/s390/char/tape_std.c
+++ b/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;