Input: i8042 - add Dell XPS M1530 to nomux list

[karo-tx-linux.git] / block / bsg.c

diff --git a/block/bsg.c b/block/bsg.c
index 0aae8d7ba99c432604995ed3b8b907623032c15e..9cfbea8f2b8328196084f4ac3cd1204f43757cf7 100644 (file)
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -202,6 +202,8 @@ static int blk_fill_sgv4_hdr_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;
 }