ar71xx: make sure that rx and interrupts are disabled before issuing the hardware...

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files / drivers / net / ag71xx / ag71xx_main.c

diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
index f0f4d2370a9fafb9c99c137e2dbdff04282ab0bb..c1143161afdc736d2603060568a2b4f1aec8e75d 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -423,10 +423,19 @@ static void ag71xx_dma_reset(struct ag71xx *ag)
                         FIFO_CFG5_LE | FIFO_CFG5_FT | FIFO_CFG5_16 | \
                         FIFO_CFG5_17 | FIFO_CFG5_SF)
 
+static void ag71xx_hw_stop(struct ag71xx *ag)
+{
+       /* disable all interrupts and stop the rx engine */
+       ag71xx_wr(ag, AG71XX_REG_INT_ENABLE, 0);
+       ag71xx_wr(ag, AG71XX_REG_RX_CTRL, 0);
+}
+
 static void ag71xx_hw_init(struct ag71xx *ag)
 {
        struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
 
+       ag71xx_hw_stop(ag);
+
        ag71xx_sb(ag, AG71XX_REG_MAC_CFG1, MAC_CFG1_SR);
        udelay(20);
 
@@ -471,13 +480,6 @@ static void ag71xx_hw_start(struct ag71xx *ag)
        ag71xx_wr(ag, AG71XX_REG_INT_ENABLE, AG71XX_INT_INIT);
 }
 
-static void ag71xx_hw_stop(struct ag71xx *ag)
-{
-       /* disable all interrupts and stop the rx engine */
-       ag71xx_wr(ag, AG71XX_REG_INT_ENABLE, 0);
-       ag71xx_wr(ag, AG71XX_REG_RX_CTRL, 0);
-}
-
 void ag71xx_link_adjust(struct ag71xx *ag)
 {
        struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);