Merge branch 'linus' into x86/quirks

1 files changed, 2 insertions, 0 deletions

diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 5963cf91a3a0..d0bb92cbefb9 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -208,6 +208,8 @@ static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
                 rq->timeout = q->sg_timeout;
         if (!rq->timeout)
                 rq->timeout = BLK_DEFAULT_SG_TIMEOUT;
+        if (rq->timeout < BLK_MIN_SG_TIMEOUT)
+                rq->timeout = BLK_MIN_SG_TIMEOUT;
 
         return 0;
 }