summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/dev/cy/cy.c12
-rw-r--r--sys/dev/cy/cy_isa.c12
-rw-r--r--sys/i386/isa/cy.c12
3 files changed, 18 insertions, 18 deletions
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 7207846..218f57f 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -428,12 +428,6 @@ sioprobe(dev)
{
cy_addr iobase;
- while (sio_inited != 2)
- if (atomic_cmpset_int(&sio_inited, 0, 1)) {
- mtx_init(&sio_lock, driver_name, NULL, MTX_SPIN);
- atomic_store_rel_int(&sio_inited, 2);
- }
-
iobase = (cy_addr)dev->id_maddr;
/* Cyclom-16Y hardware reset (Cyclom-8Ys don't care) */
@@ -538,6 +532,12 @@ cyattach_common(cy_iobase, cy_align)
int ncyu;
int unit;
+ while (sio_inited != 2)
+ if (atomic_cmpset_int(&sio_inited, 0, 1)) {
+ mtx_init(&sio_lock, driver_name, NULL, MTX_SPIN);
+ atomic_store_rel_int(&sio_inited, 2);
+ }
+
adapter = cy_total_devices;
if ((u_int)adapter >= NCY) {
printf(
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 7207846..218f57f 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -428,12 +428,6 @@ sioprobe(dev)
{
cy_addr iobase;
- while (sio_inited != 2)
- if (atomic_cmpset_int(&sio_inited, 0, 1)) {
- mtx_init(&sio_lock, driver_name, NULL, MTX_SPIN);
- atomic_store_rel_int(&sio_inited, 2);
- }
-
iobase = (cy_addr)dev->id_maddr;
/* Cyclom-16Y hardware reset (Cyclom-8Ys don't care) */
@@ -538,6 +532,12 @@ cyattach_common(cy_iobase, cy_align)
int ncyu;
int unit;
+ while (sio_inited != 2)
+ if (atomic_cmpset_int(&sio_inited, 0, 1)) {
+ mtx_init(&sio_lock, driver_name, NULL, MTX_SPIN);
+ atomic_store_rel_int(&sio_inited, 2);
+ }
+
adapter = cy_total_devices;
if ((u_int)adapter >= NCY) {
printf(
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index 7207846..218f57f 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -428,12 +428,6 @@ sioprobe(dev)
{
cy_addr iobase;
- while (sio_inited != 2)
- if (atomic_cmpset_int(&sio_inited, 0, 1)) {
- mtx_init(&sio_lock, driver_name, NULL, MTX_SPIN);
- atomic_store_rel_int(&sio_inited, 2);
- }
-
iobase = (cy_addr)dev->id_maddr;
/* Cyclom-16Y hardware reset (Cyclom-8Ys don't care) */
@@ -538,6 +532,12 @@ cyattach_common(cy_iobase, cy_align)
int ncyu;
int unit;
+ while (sio_inited != 2)
+ if (atomic_cmpset_int(&sio_inited, 0, 1)) {
+ mtx_init(&sio_lock, driver_name, NULL, MTX_SPIN);
+ atomic_store_rel_int(&sio_inited, 2);
+ }
+
adapter = cy_total_devices;
if ((u_int)adapter >= NCY) {
printf(
OpenPOWER on IntegriCloud