diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-02-28 13:41:12 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-28 13:41:12 -0500 |
| commit | 6fc2de06ef1e691d032aa572478c905b7495a274 (patch) | |
| tree | 778df1440b045d67c997d7bd79ee3c6c11f57638 /drivers/scsi/st.c | |
| parent | 58c24a61614f5da290068e47fc5ec65370eb61dd (diff) | |
| parent | 8a78362c4eefc1deddbefe2c7f38aabbc2429d6b (diff) | |
Merge branch 'for-2.6.34-next' into for-2.6.34
Diffstat (limited to 'drivers/scsi/st.c')
| -rw-r--r-- | drivers/scsi/st.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index d04ea9a6f673..f67d1a159aad 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c | |||
| @@ -3983,8 +3983,7 @@ static int st_probe(struct device *dev) | |||
| 3983 | return -ENODEV; | 3983 | return -ENODEV; |
| 3984 | } | 3984 | } |
| 3985 | 3985 | ||
| 3986 | i = min(queue_max_hw_segments(SDp->request_queue), | 3986 | i = queue_max_segments(SDp->request_queue); |
| 3987 | queue_max_phys_segments(SDp->request_queue)); | ||
| 3988 | if (st_max_sg_segs < i) | 3987 | if (st_max_sg_segs < i) |
| 3989 | i = st_max_sg_segs; | 3988 | i = st_max_sg_segs; |
| 3990 | buffer = new_tape_buffer((SDp->host)->unchecked_isa_dma, i); | 3989 | buffer = new_tape_buffer((SDp->host)->unchecked_isa_dma, i); |