X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=block%2Fbsg.c;h=e73e50daf3d0a36df8977cad29b550e3139fbef0;hb=f2f1fa78a155524b849edf359e42a3001ea652c0;hp=e8bd2475682ab4c2d29f8f205e57b62427b7cfe2;hpb=22484856402bfa1ff3defe47f6029ab0418240d9;p=linux-2.6-omap-h63xx.git

diff --git a/block/bsg.c b/block/bsg.c
index e8bd2475682..e73e50daf3d 100644
--- 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;
 }