diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
| commit | 7d72e6fa56c4100b9669efe0044f77ed9eb785a1 (patch) | |
| tree | 5e90bf4969809a1ab20b97432b85be20ccfaa1f4 /drivers/message/i2o/i2o_scsi.c | |
| parent | ba00376b0b13f234d839541a7b36a5bf5c2a4036 (diff) | |
| parent | 2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/message/i2o/i2o_scsi.c')
| -rw-r--r-- | drivers/message/i2o/i2o_scsi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/message/i2o/i2o_scsi.c b/drivers/message/i2o/i2o_scsi.c index 3d45817e6dcd..ea6b2197da8a 100644 --- a/drivers/message/i2o/i2o_scsi.c +++ b/drivers/message/i2o/i2o_scsi.c | |||
| @@ -528,7 +528,6 @@ static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt, | |||
| 528 | * Do the incoming paperwork | 528 | * Do the incoming paperwork |
| 529 | */ | 529 | */ |
| 530 | i2o_dev = SCpnt->device->hostdata; | 530 | i2o_dev = SCpnt->device->hostdata; |
| 531 | c = i2o_dev->iop; | ||
| 532 | 531 | ||
| 533 | SCpnt->scsi_done = done; | 532 | SCpnt->scsi_done = done; |
| 534 | 533 | ||
| @@ -538,7 +537,7 @@ static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt, | |||
| 538 | done(SCpnt); | 537 | done(SCpnt); |
| 539 | goto exit; | 538 | goto exit; |
| 540 | } | 539 | } |
| 541 | 540 | c = i2o_dev->iop; | |
| 542 | tid = i2o_dev->lct_data.tid; | 541 | tid = i2o_dev->lct_data.tid; |
| 543 | 542 | ||
| 544 | osm_debug("qcmd: Tid = %03x\n", tid); | 543 | osm_debug("qcmd: Tid = %03x\n", tid); |