mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-09-12 05:10:16 +03:00
ramips: request_irq prior to dma allocation, and handle the case if it fails
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18173 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
fae14fc50e
commit
6e0afb85b9
@ -302,10 +302,15 @@ ramips_eth_open(struct net_device *dev)
|
|||||||
struct raeth_priv *priv = netdev_priv(dev);
|
struct raeth_priv *priv = netdev_priv(dev);
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
err = ramips_alloc_dma(dev);
|
err = request_irq(dev->irq, ramips_eth_irq, IRQF_DISABLED,
|
||||||
|
dev->name, dev);
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
|
err = ramips_alloc_dma(dev);
|
||||||
|
if (err)
|
||||||
|
goto err_free_irq;
|
||||||
|
|
||||||
ramips_setup_dma(dev);
|
ramips_setup_dma(dev);
|
||||||
ramips_fe_wr((ramips_fe_rr(RAMIPS_PDMA_GLO_CFG) & 0xff) |
|
ramips_fe_wr((ramips_fe_rr(RAMIPS_PDMA_GLO_CFG) & 0xff) |
|
||||||
(RAMIPS_TX_WB_DDONE | RAMIPS_RX_DMA_EN |
|
(RAMIPS_TX_WB_DDONE | RAMIPS_RX_DMA_EN |
|
||||||
@ -315,7 +320,6 @@ ramips_eth_open(struct net_device *dev)
|
|||||||
~(RAMIPS_US_CYC_CNT_MASK << RAMIPS_US_CYC_CNT_SHIFT)) |
|
~(RAMIPS_US_CYC_CNT_MASK << RAMIPS_US_CYC_CNT_SHIFT)) |
|
||||||
((rt305x_sys_freq / RAMIPS_US_CYC_CNT_DIVISOR) << RAMIPS_US_CYC_CNT_SHIFT),
|
((rt305x_sys_freq / RAMIPS_US_CYC_CNT_DIVISOR) << RAMIPS_US_CYC_CNT_SHIFT),
|
||||||
RAMIPS_FE_GLO_CFG);
|
RAMIPS_FE_GLO_CFG);
|
||||||
request_irq(dev->irq, ramips_eth_irq, IRQF_DISABLED, dev->name, dev);
|
|
||||||
tasklet_init(&priv->tx_housekeeping_tasklet, ramips_eth_tx_housekeeping,
|
tasklet_init(&priv->tx_housekeeping_tasklet, ramips_eth_tx_housekeeping,
|
||||||
(unsigned long)dev);
|
(unsigned long)dev);
|
||||||
tasklet_init(&priv->rx_tasklet, ramips_eth_rx_hw, (unsigned long)dev);
|
tasklet_init(&priv->rx_tasklet, ramips_eth_rx_hw, (unsigned long)dev);
|
||||||
@ -332,6 +336,10 @@ ramips_eth_open(struct net_device *dev)
|
|||||||
ramips_fe_wr(0, RAMIPS_FE_RST_GL);
|
ramips_fe_wr(0, RAMIPS_FE_RST_GL);
|
||||||
netif_start_queue(dev);
|
netif_start_queue(dev);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
err_free_irq:
|
||||||
|
free_irq(dev->irq, dev);
|
||||||
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
Loading…
Reference in New Issue
Block a user