staging: octeon: prevent poll during rx init

Prevent poll before the RX init has been completed.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
index 4f32fa37d5de27a1151762e032f42e963be29848..ce1e2a321abb7338b58601c8be61069c8deeabe2 100644 (file)
--- a/drivers/staging/octeon/ethernet-rx.c
+++ b/drivers/staging/octeon/ethernet-rx.c
@@ -43,6 +43,8 @@
 
 #include <asm/octeon/cvmx-gmxx-defs.h>
 
+static atomic_t oct_rx_ready = ATOMIC_INIT(0);
+
 static struct oct_rx_group {
        int irq;
        int group;
@@ -444,6 +446,9 @@ void cvm_oct_poll_controller(struct net_device *dev)
 {
        int i;
 
+       if (!atomic_read(&oct_rx_ready))
+               return;
+
        for (i = 0; i < ARRAY_SIZE(oct_rx_group); i++) {
 
                if (!(pow_receive_groups & BIT(i)))
@@ -524,6 +529,7 @@ void cvm_oct_rx_initialize(void)
                 */
                napi_schedule(&oct_rx_group[i].napi);
        }
+       atomic_inc(&oct_rx_ready);
 }
 
 void cvm_oct_rx_shutdown(void)