diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-12-15 21:17:02 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-12-15 21:17:02 -0500 |
| commit | 7b16318dea8d9840dac567a2ae8c50ecdea36aea (patch) | |
| tree | 8866511a03ba28dcfd98263aa0a8c65ef876c31b /drivers/scsi/sr.c | |
| parent | 2a1e1379bae53f647c463a677cc2ec71b591c348 (diff) | |
Fix up SCSI mismerge
I forgot to do a git-update-cache on the merged files ...
Diffstat (limited to 'drivers/scsi/sr.c')
| -rw-r--r-- | drivers/scsi/sr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 7e7398d563cc..a4d9be7c6874 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c | |||
| @@ -320,7 +320,7 @@ static int sr_init_command(struct scsi_cmnd * SCpnt) | |||
| 320 | * these are already setup, just copy cdb basically | 320 | * these are already setup, just copy cdb basically |
| 321 | */ | 321 | */ |
| 322 | if (SCpnt->request->flags & REQ_BLOCK_PC) { | 322 | if (SCpnt->request->flags & REQ_BLOCK_PC) { |
| 323 | scsi_setup_blk_pc_cmnd(SCpnt, MAX_RETRIES); | 323 | scsi_setup_blk_pc_cmnd(SCpnt); |
| 324 | 324 | ||
| 325 | if (SCpnt->timeout_per_command) | 325 | if (SCpnt->timeout_per_command) |
| 326 | timeout = SCpnt->timeout_per_command; | 326 | timeout = SCpnt->timeout_per_command; |