| commit | 7b16318dea8d9840dac567a2ae8c50ecdea36aea | [log] [tgz] |
|---|---|---|
| author | James Bottomley <jejb@titanic.(none)> | Thu Dec 15 20:17:02 2005 -0600 |
| committer | James Bottomley <jejb@titanic.(none)> | Thu Dec 15 20:17:02 2005 -0600 |
| tree | 8866511a03ba28dcfd98263aa0a8c65ef876c31b | |
| parent | 2a1e1379bae53f647c463a677cc2ec71b591c348 [diff] [blame] |
Fix up SCSI mismerge I forgot to do a git-update-cache on the merged files ...
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 9d893f0..3d3ad7d 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c
@@ -245,7 +245,7 @@ * SG_IO from block layer already setup, just copy cdb basically */ if (blk_pc_request(rq)) { - scsi_setup_blk_pc_cmnd(SCpnt, SD_PASSTHROUGH_RETRIES); + scsi_setup_blk_pc_cmnd(SCpnt); if (rq->timeout) timeout = rq->timeout;