1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/s390/char/tape_std.c b/drivers/s390/char/tape_std.c
index 2f9fe30989a7..99cf881f41db 100644
--- a/drivers/s390/char/tape_std.c
+++ b/drivers/s390/char/tape_std.c
@@ -37,20 +37,19 @@ tape_std_assign_timeout(unsigned long data)
 {
         struct tape_request *   request;
         struct tape_device *    device;
+        int rc;
 
         request = (struct tape_request *) data;
         if ((device = request->device) == NULL)
                 BUG();
 
-        spin_lock_irq(get_ccwdev_lock(device->cdev));
-        if (request->callback != NULL) {
-                DBF_EVENT(3, "%08x: Assignment timeout. Device busy.\n",
+        DBF_EVENT(3, "%08x: Assignment timeout. Device busy.\n",
                         device->cdev_id);
-                PRINT_ERR("%s: Assignment timeout. Device busy.\n",
-                        device->cdev->dev.bus_id);
-                ccw_device_clear(device->cdev, (long) request);
-        }
-        spin_unlock_irq(get_ccwdev_lock(device->cdev));
+        rc = tape_cancel_io(device, request);
+        if(rc)
+                PRINT_ERR("(%s): Assign timeout: Cancel failed with rc = %i\n",
+                        device->cdev->dev.bus_id, rc);
+
 }
 
 int