diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-12-15 17:35:24 -0600 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-12-15 17:35:24 -0600 |
| commit | 2a1e1379bae53f647c463a677cc2ec71b591c348 (patch) | |
| tree | a152beb5e8679e94430c5b47bf798dd8a2d4fd5d /drivers/scsi/sym53c8xx_2/sym_hipd.c | |
| parent | 787926b1b2d21d42ca462dc736b77f1a4a30c503 (diff) | |
| parent | 7b6666530e2736f190a2629c8abe34275054449f (diff) | |
Merge by hand (conflicts in scsi_lib.c)
This merge is pretty extensive. The conflict is over the new
req->retries parameter, so I had to change the prototype to
scsi_setup_blk_pc_cmnd() and the usage in sd, sr and st.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/sym53c8xx_2/sym_hipd.c')
| -rw-r--r-- | drivers/scsi/sym53c8xx_2/sym_hipd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c index 7a3c807dcfc..1010e716162 100644 --- a/drivers/scsi/sym53c8xx_2/sym_hipd.c +++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c @@ -1356,7 +1356,6 @@ static void sym_check_goals(struct sym_hcb *np, struct scsi_target *starget, goal->iu = 0; goal->dt = 0; goal->qas = 0; - goal->period = 0; goal->offset = 0; return; } @@ -1416,7 +1415,8 @@ static int sym_prepare_nego(struct sym_hcb *np, struct sym_ccb *cp, u_char *msgp * Many devices implement PPR in a buggy way, so only use it if we * really want to. */ - if (goal->iu || goal->dt || goal->qas || (goal->period < 0xa)) { + if (goal->offset && + (goal->iu || goal->dt || goal->qas || (goal->period < 0xa))) { nego = NS_PPR; } else if (spi_width(starget) != goal->width) { nego = NS_WIDE; |