diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-22 19:13:54 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-22 19:13:54 -0500 |
| commit | f01c18456993bab43067b678f56c87ca954aa43b (patch) | |
| tree | 3e0cd0cdf1a57618202b46a7126125902e3ab832 /drivers/scsi/ips.c | |
| parent | 949ec2c8e6b7b89179b85baf6309c009e1a1b951 (diff) | |
| parent | 1c2e02750b992703a8a18634e08b04353face243 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/scsi/ips.c')
| -rw-r--r-- | drivers/scsi/ips.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c index 86c546164da9..481708d527ae 100644 --- a/drivers/scsi/ips.c +++ b/drivers/scsi/ips.c | |||
| @@ -1146,7 +1146,7 @@ ips_queue(Scsi_Cmnd * SC, void (*done) (Scsi_Cmnd *)) | |||
| 1146 | return (0); | 1146 | return (0); |
| 1147 | } | 1147 | } |
| 1148 | ha->ioctl_reset = 1; /* This reset request is from an IOCTL */ | 1148 | ha->ioctl_reset = 1; /* This reset request is from an IOCTL */ |
| 1149 | ips_eh_reset(SC); | 1149 | __ips_eh_reset(SC); |
| 1150 | SC->result = DID_OK << 16; | 1150 | SC->result = DID_OK << 16; |
| 1151 | SC->scsi_done(SC); | 1151 | SC->scsi_done(SC); |
| 1152 | return (0); | 1152 | return (0); |