aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/aic7xxx/aic7xxx_osm.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 116d0f51ca2c..d0d0b84a31f4 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -1635,9 +1635,9 @@ ahc_send_async(struct ahc_softc *ahc, char channel,
1635 spi_period(starget) = tinfo->curr.period; 1635 spi_period(starget) = tinfo->curr.period;
1636 spi_width(starget) = tinfo->curr.width; 1636 spi_width(starget) = tinfo->curr.width;
1637 spi_offset(starget) = tinfo->curr.offset; 1637 spi_offset(starget) = tinfo->curr.offset;
1638 spi_dt(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_DT_REQ; 1638 spi_dt(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_DT_REQ ? 1 : 0;
1639 spi_qas(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_QAS_REQ; 1639 spi_qas(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_QAS_REQ ? 1 : 0;
1640 spi_iu(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_IU_REQ; 1640 spi_iu(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_IU_REQ ? 1 : 0;
1641 spi_display_xfer_agreement(starget); 1641 spi_display_xfer_agreement(starget);
1642 break; 1642 break;
1643 } 1643 }
@@ -2435,8 +2435,10 @@ static void ahc_linux_set_dt(struct scsi_target *starget, int dt)
2435 if (dt) { 2435 if (dt) {
2436 period = 9; /* 12.5ns is the only period valid for DT */ 2436 period = 9; /* 12.5ns is the only period valid for DT */
2437 ppr_options |= MSG_EXT_PPR_DT_REQ; 2437 ppr_options |= MSG_EXT_PPR_DT_REQ;
2438 } else if (period == 9) 2438 } else if (period == 9) {
2439 period = 10; /* if resetting DT, period must be >= 25ns */ 2439 period = 10; /* if resetting DT, period must be >= 25ns */
2440 ppr_options &= ~MSG_EXT_PPR_DT_REQ;
2441 }
2440 2442
2441 ahc_compile_devinfo(&devinfo, shost->this_id, starget->id, 0, 2443 ahc_compile_devinfo(&devinfo, shost->this_id, starget->id, 0,
2442 starget->channel + 'A', ROLE_INITIATOR); 2444 starget->channel + 'A', ROLE_INITIATOR);