Fix up SCSI mismerge

I forgot to do a git-update-cache on the merged files ...

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;