2 files changed, 20 insertions, 22 deletions

diff --git a/drivers/s390/char/tape_34xx.c b/drivers/s390/char/tape_34xx.c
index ea3e6a345c89..5b47e9cce75f 100644
--- a/drivers/s390/char/tape_34xx.c
+++ b/drivers/s390/char/tape_34xx.c
@@ -1173,16 +1173,15 @@ tape_34xx_bread(struct tape_device *device, struct request *req)
         ccw = tape_ccw_cc(ccw, NOP, 0, NULL);
 
         rq_for_each_segment(bv, req, iter) {
-                        dst = kmap(bv->bv_page) + bv->bv_offset;
-                        for (off = 0; off < bv->bv_len;
-                             off += TAPEBLOCK_HSEC_SIZE) {
-                                ccw->flags = CCW_FLAG_CC;
-                                ccw->cmd_code = READ_FORWARD;
-                                ccw->count = TAPEBLOCK_HSEC_SIZE;
-                                set_normalized_cda(ccw, (void*) __pa(dst));
-                                ccw++;
-                                dst += TAPEBLOCK_HSEC_SIZE;
-                        }
+                dst = kmap(bv->bv_page) + bv->bv_offset;
+                for (off = 0; off < bv->bv_len; off += TAPEBLOCK_HSEC_SIZE) {
+                        ccw->flags = CCW_FLAG_CC;
+                        ccw->cmd_code = READ_FORWARD;
+                        ccw->count = TAPEBLOCK_HSEC_SIZE;
+                        set_normalized_cda(ccw, (void*) __pa(dst));
+                        ccw++;
+                        dst += TAPEBLOCK_HSEC_SIZE;
+                }
         }
 
         ccw = tape_ccw_end(ccw, NOP, 0, NULL);
diff --git a/drivers/s390/char/tape_3590.c b/drivers/s390/char/tape_3590.c
index b16ad7a7631d..9f244c591eeb 100644
--- a/drivers/s390/char/tape_3590.c
+++ b/drivers/s390/char/tape_3590.c
@@ -652,18 +652,17 @@ tape_3590_bread(struct tape_device *device, struct request *req)
         ccw = tape_ccw_cc(ccw, NOP, 0, NULL);
 
         rq_for_each_segment(bv, req, iter) {
-                        dst = page_address(bv->bv_page) + bv->bv_offset;
-                        for (off = 0; off < bv->bv_len;
-                             off += TAPEBLOCK_HSEC_SIZE) {
-                                ccw->flags = CCW_FLAG_CC;
-                                ccw->cmd_code = READ_FORWARD;
-                                ccw->count = TAPEBLOCK_HSEC_SIZE;
-                                set_normalized_cda(ccw, (void *) __pa(dst));
-                                ccw++;
-                                dst += TAPEBLOCK_HSEC_SIZE;
-                        }
-                        if (off > bv->bv_len)
-                                BUG();
+                dst = page_address(bv->bv_page) + bv->bv_offset;
+                for (off = 0; off < bv->bv_len; off += TAPEBLOCK_HSEC_SIZE) {
+                        ccw->flags = CCW_FLAG_CC;
+                        ccw->cmd_code = READ_FORWARD;
+                        ccw->count = TAPEBLOCK_HSEC_SIZE;
+                        set_normalized_cda(ccw, (void *) __pa(dst));
+                        ccw++;
+                        dst += TAPEBLOCK_HSEC_SIZE;
+                }
+                if (off > bv->bv_len)
+                        BUG();
         }
         ccw = tape_ccw_end(ccw, NOP, 0, NULL);
         DBF_EVENT(6, "xBREDccwg\n");