diff options
Diffstat (limited to 'drivers/scsi/osst.c')
| -rw-r--r-- | drivers/scsi/osst.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c index 1c5c4b68f20f..4652ad22516b 100644 --- a/drivers/scsi/osst.c +++ b/drivers/scsi/osst.c | |||
| @@ -5256,8 +5256,7 @@ static int enlarge_buffer(struct osst_buffer *STbuffer, int need_dma) | |||
| 5256 | 5256 | ||
| 5257 | STbuffer->sg[0].offset = 0; | 5257 | STbuffer->sg[0].offset = 0; |
| 5258 | if (page != NULL) { | 5258 | if (page != NULL) { |
| 5259 | sg_set_page(&STbuffer->sg[0], page); | 5259 | sg_set_page(&STbuffer->sg[0], page, b_size, 0); |
| 5260 | STbuffer->sg[0].length = b_size; | ||
| 5261 | STbuffer->b_data = page_address(page); | 5260 | STbuffer->b_data = page_address(page); |
| 5262 | break; | 5261 | break; |
| 5263 | } | 5262 | } |
| @@ -5285,8 +5284,7 @@ static int enlarge_buffer(struct osst_buffer *STbuffer, int need_dma) | |||
| 5285 | normalize_buffer(STbuffer); | 5284 | normalize_buffer(STbuffer); |
| 5286 | return 0; | 5285 | return 0; |
| 5287 | } | 5286 | } |
| 5288 | sg_set_page(&STbuffer->sg[segs], page); | 5287 | sg_set_page(&STbuffer->sg[segs], page, (OS_FRAME_SIZE - got <= PAGE_SIZE / 2) ? (OS_FRAME_SIZE - got) : b_size, 0); |
| 5289 | STbuffer->sg[segs].length = (OS_FRAME_SIZE - got <= PAGE_SIZE / 2) ? (OS_FRAME_SIZE - got) : b_size; | ||
| 5290 | got += STbuffer->sg[segs].length; | 5288 | got += STbuffer->sg[segs].length; |
| 5291 | STbuffer->buffer_size = got; | 5289 | STbuffer->buffer_size = got; |
| 5292 | STbuffer->sg_segs = ++segs; | 5290 | STbuffer->sg_segs = ++segs; |