aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/isp/isp_sbus.c
diff options
context:
space:
mode:
authorAlexander Motin <mav@FreeBSD.org>2015-10-25 10:49:05 +0000
committerAlexander Motin <mav@FreeBSD.org>2015-10-25 10:49:05 +0000
commitdfd246496aa937f5ca533238faddf57198a99273 (patch)
tree7c0708e6a8930eb1fbeb22e83aa22cbe6da0817d /sys/dev/isp/isp_sbus.c
parent3e973f9b6df8c006b71f738957a3791bdb7ad0e3 (diff)
Notes
Diffstat (limited to 'sys/dev/isp/isp_sbus.c')
-rw-r--r--sys/dev/isp/isp_sbus.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/dev/isp/isp_sbus.c b/sys/dev/isp/isp_sbus.c
index 14b3941676fcd..cebfe8b766e02 100644
--- a/sys/dev/isp/isp_sbus.c
+++ b/sys/dev/isp/isp_sbus.c
@@ -313,16 +313,11 @@ isp_sbus_attach(device_t dev)
* Make sure we're in reset state.
*/
ISP_LOCK(isp);
- isp_reset(isp, 1);
- if (isp->isp_state != ISP_RESETSTATE) {
+ if (isp_reinit(isp, 1) != 0) {
isp_uninit(isp);
ISP_UNLOCK(isp);
goto bad;
}
- isp_init(isp);
- if (isp->isp_state == ISP_INITSTATE) {
- isp->isp_state = ISP_RUNSTATE;
- }
ISP_UNLOCK(isp);
if (isp_attach(isp)) {
ISP_LOCK(isp);