Merge by hand: recover axboe scsi_init_io() changes

8159b141 · James Bottomley · 41c8a0e4 · 8159b141
Commit 8159b141 authored Oct 27, 2002 by James Bottomley
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

drivers/scsi/scsi_lib.c drivers/scsi/scsi_lib.c +2 -0

No files found.
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -789,6 +789,8 @@ static int scsi_init_io(Scsi_Cmnd *SCpnt)

 	SCpnt->request_buffer = (char *) sgpnt;
 	SCpnt->request_bufflen = req->nr_sectors << 9;
+	if (blk_pc_request(req))
+		SCpnt->request_bufflen = req->data_len;
 	req->buffer = NULL;

 	/*