aboutsummaryrefslogtreecommitdiff
path: root/drivers/fc4/fc.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-04 13:08:29 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-04 13:08:29 -0700
commit6fb0caa42308923d9e4ed7b36ec077b97c107e24 (patch)
treef1418651333a8afd9c487ef4aaf843301d93fd50 /drivers/fc4/fc.c
parent7cfa132cd06639c8ac5fe9ef776a7650f1d8c3e6 (diff)
parentfdd0edf2aca72e374d10e7a0957a006f18bffaf4 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'drivers/fc4/fc.c')
-rw-r--r--drivers/fc4/fc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/fc4/fc.c b/drivers/fc4/fc.c
index 5d961f5e0ca..e4710d1d1f9 100644
--- a/drivers/fc4/fc.c
+++ b/drivers/fc4/fc.c
@@ -1004,8 +1004,8 @@ int fcp_scsi_dev_reset(Scsi_Cmnd *SCpnt)
return FAILED;
}
fc->rst_pkt->eh_state = SCSI_STATE_UNUSED;
- return SUCCESS;
#endif
+ return SUCCESS;
}
static int __fcp_scsi_host_reset(Scsi_Cmnd *SCpnt)