summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sd.c
diff options
context:
space:
mode:
authorJames Bottomley <jejb@titanic.(none)>2005-12-15 20:17:02 -0600
committerJames Bottomley <jejb@titanic.(none)>2005-12-15 20:17:02 -0600
commit7b16318dea8d9840dac567a2ae8c50ecdea36aea (patch)
tree8866511a03ba28dcfd98263aa0a8c65ef876c31b /drivers/scsi/sd.c
parent2a1e1379bae53f647c463a677cc2ec71b591c348 (diff)
downloadlinux-7b16318dea8d9840dac567a2ae8c50ecdea36aea.tar.bz2
Fix up SCSI mismerge
I forgot to do a git-update-cache on the merged files ...
Diffstat (limited to 'drivers/scsi/sd.c')
-rw-r--r--drivers/scsi/sd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 9d893f085015..3d3ad7d1b779 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -245,7 +245,7 @@ static int sd_init_command(struct scsi_cmnd * SCpnt)
* 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;