diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 1de089019268e10279a4c88be7767cf11f21eb96..6a0c9df8f323758848afd82c1654f28957ae00ce 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -3140,7 +3140,7 @@ static void dasd_setup_queue(struct dasd_block *block)
 	blk_queue_logical_block_size(block->request_queue,
 				     block->bp_block);
 	blk_queue_max_hw_sectors(block->request_queue, max);
-	blk_queue_max_segments(block->request_queue, -1L);
+	blk_queue_max_segments(block->request_queue, USHRT_MAX);
 	/* with page sized segments we can translate each segement into
 	 * one idaw/tidaw
 	 */