diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-10-26 17:17:42 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-10-26 17:17:42 +0000 |
| commit | 6e0afb85b95602f9e1208c9e64d40264b979d54d (patch) | |
| tree | 347da82a8c7ab93d14a210c3d347b6a2bc323592 /target | |
| parent | fae14fc50e488238410d22d0849885fd871b3737 (diff) | |
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
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/ramips/files/drivers/net/ramips.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/target/linux/ramips/files/drivers/net/ramips.c b/target/linux/ramips/files/drivers/net/ramips.c index 35c44cc52..fa09caa78 100644 --- a/target/linux/ramips/files/drivers/net/ramips.c +++ b/target/linux/ramips/files/drivers/net/ramips.c @@ -302,10 +302,15 @@ ramips_eth_open(struct net_device *dev) struct raeth_priv *priv = netdev_priv(dev); int err; - err = ramips_alloc_dma(dev); + err = request_irq(dev->irq, ramips_eth_irq, IRQF_DISABLED, + dev->name, dev); if (err) return err; + err = ramips_alloc_dma(dev); + if (err) + goto err_free_irq; + ramips_setup_dma(dev); ramips_fe_wr((ramips_fe_rr(RAMIPS_PDMA_GLO_CFG) & 0xff) | (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)) | ((rt305x_sys_freq / RAMIPS_US_CYC_CNT_DIVISOR) << RAMIPS_US_CYC_CNT_SHIFT), 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, (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); netif_start_queue(dev); return 0; + + err_free_irq: + free_irq(dev->irq, dev); + return err; } static int |