diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-12 13:48:57 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-12 13:48:57 +0100 |
| commit | 45ab6b0c76d0e4cce5bd608ccf97b0f6b20f18df (patch) | |
| tree | 4d51c73533c386aee16fde1e74b5e3bc22eedc53 /block/bsg.c | |
| parent | Merge branch 'tracing/fastboot' into cpus4096 (diff) | |
| parent | sched: add missing arch_update_cpu_topology() call (diff) | |
| download | linux-45ab6b0c76d0e4cce5bd608ccf97b0f6b20f18df.tar.xz linux-45ab6b0c76d0e4cce5bd608ccf97b0f6b20f18df.zip | |
Merge branch 'sched/core' into cpus4096
Conflicts:
include/linux/ftrace.h
kernel/sched.c
Diffstat (limited to 'block/bsg.c')
| -rw-r--r-- | block/bsg.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/bsg.c b/block/bsg.c index e8bd2475682a..e73e50daf3d0 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; } |