2 files changed, 8 insertions, 6 deletions

diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c
index 47ff695255ea..1c2a582e626c 100644
--- a/drivers/s390/char/tape_block.c
+++ b/drivers/s390/char/tape_block.c
@@ -302,8 +302,6 @@ tapeblock_revalidate_disk(struct gendisk *disk)
         if (!device->blk_data.medium_changed)
                 return 0;
 
-        dev_info(&device->cdev->dev, "Determining the size of the recorded "
-                "area...\n");
         rc = tape_mtop(device, MTFSFM, 1);
         if (rc)
                 return rc;
@@ -312,6 +310,8 @@ tapeblock_revalidate_disk(struct gendisk *disk)
         if (rc < 0)
                 return rc;
 
+        dev_info(&device->cdev->dev, "Determining the size of the recorded "
+                "area...\n");
         DBF_LH(3, "Image file ends at %d\n", rc);
         nr_of_blks = rc;
 
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index 7424d648e81f..934a42ebe11f 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -214,13 +214,15 @@ tape_med_state_set(struct tape_device *device, enum tape_medium_state newstate)
         switch(newstate){
         case MS_UNLOADED:
                 device->tape_generic_status |= GMT_DR_OPEN(~0);
-                dev_info(&device->cdev->dev, "The tape cartridge has been "
-                        "successfully unloaded\n");
+                if (device->medium_state == MS_LOADED)
+                        dev_info(&device->cdev->dev, "The tape cartridge has "
+                                 "been successfully unloaded\n");
                 break;
         case MS_LOADED:
                 device->tape_generic_status &= ~GMT_DR_OPEN(~0);
-                dev_info(&device->cdev->dev, "A tape cartridge has been "
-                        "mounted\n");
+                if (device->medium_state == MS_UNLOADED)
+                        dev_info(&device->cdev->dev, "A tape cartridge has "
+                                 "been mounted\n");
                 break;
         default:
                 // print nothing