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/scsi_error.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/scsi_error.c')
| -rw-r--r-- | drivers/scsi/scsi_error.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index 53ea62d3b53..a2333d2c7af 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c @@ -422,10 +422,15 @@ static int scsi_eh_completed_normally(struct scsi_cmnd *scmd) **/ static void scsi_eh_done(struct scsi_cmnd *scmd) { + struct completion *eh_action; + SCSI_LOG_ERROR_RECOVERY(3, printk("%s scmd: %p result: %x\n", __FUNCTION__, scmd, scmd->result)); - complete(scmd->device->host->eh_action); + + eh_action = scmd->device->host->eh_action; + if (eh_action) + complete(eh_action); } /** |