diff options
author | Jody McIntyre <scjody@modernduck.com> | 2006-01-04 11:43:17 -0500 |
---|---|---|
committer | Jody McIntyre <scjody@modernduck.com> | 2006-01-04 11:43:17 -0500 |
commit | 34b8c399dc04c8e51f014b73458e654570698597 (patch) | |
tree | 7027eda7a780e9d945ef271f8c2ea5aaede5dd25 /drivers/scsi/sym53c8xx_2 | |
parent | eaceec7f6cc5223d0f146086884d67746b8aa81d (diff) | |
parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
download | blackbird-op-linux-34b8c399dc04c8e51f014b73458e654570698597.tar.gz blackbird-op-linux-34b8c399dc04c8e51f014b73458e654570698597.zip |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/scsi/sym53c8xx_2')
-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 a7420cad4547..1564ca203a3e 100644 --- a/drivers/scsi/sym53c8xx_2/sym_hipd.c +++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c @@ -1405,7 +1405,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; } @@ -1465,7 +1464,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; |