diff options
| author | mav <mav@FreeBSD.org> | 2015-10-25 10:49:05 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2015-10-25 10:49:05 +0000 |
| commit | 602679883920819b09fc6a283d74b9e6be55af03 (patch) | |
| tree | 7c0708e6a8930eb1fbeb22e83aa22cbe6da0817d /sys/dev/isp/isp_pci.c | |
| parent | 5ed05b2c9b555cf97cf76324a71ee14b23f6366a (diff) | |
| download | FreeBSD-src-602679883920819b09fc6a283d74b9e6be55af03.zip FreeBSD-src-602679883920819b09fc6a283d74b9e6be55af03.tar.gz | |
Formalize/unify chip (re-)inits.
Diffstat (limited to 'sys/dev/isp/isp_pci.c')
| -rw-r--r-- | sys/dev/isp/isp_pci.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c index 9f8c82d..cbc1994 100644 --- a/sys/dev/isp/isp_pci.c +++ b/sys/dev/isp/isp_pci.c @@ -991,15 +991,10 @@ isp_pci_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_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); |
