Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[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 981a99fd8d4285c2b443f81a320c48f8826871cf..3478e19ae194567520c93838b8a1ed2316c8d061 100644 (file)
--- a/drivers/s390/char/tape_std.c
+++ b/drivers/s390/char/tape_std.c
@@ -78,7 +78,8 @@ tape_std_assign(struct tape_device *device)
 
        rc = tape_do_io_interruptible(device, request);
 
-       del_timer(&timeout);
+       del_timer_sync(&timeout);
+       destroy_timer_on_stack(&timeout);
 
        if (rc != 0) {
                DBF_EVENT(3, "%08x: assign failed - device might be busy\n",