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>

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 7a3c807dcfca..1010e716162e 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;