KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ramips: request_irq prior to dma allocation, and handle the case if it fails

Browse source 
SVN-Revision: 18173
This commit is contained in:
Gabor Juhos 2009-10-26 17:17:42 +00:00
parent 08f77d2e7e
commit b98fa096a6
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
target/linux/ramips/files/drivers/net/ramips.c
View file

@ -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