summaryrefslogtreecommitdiff
path: root/drivers/scsi/st.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/st.c
parent2a1e1379bae53f647c463a677cc2ec71b591c348 (diff)
Fix up SCSI mismerge
I forgot to do a git-update-cache on the merged files ...
Diffstat (limited to 'drivers/scsi/st.c')
-rw-r--r--drivers/scsi/st.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 894ad53be04..c4aade8f534 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -4198,7 +4198,7 @@ static int st_init_command(struct scsi_cmnd *SCpnt)
if (!(SCpnt->request->flags & REQ_BLOCK_PC))
return 0;
- scsi_setup_blk_pc_cmnd(SCpnt, 0);
+ scsi_setup_blk_pc_cmnd(SCpnt);
SCpnt->done = st_intr;
return 1;
}