diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-10-26 17:17:42 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-10-26 17:17:42 +0000 |
| commit | b98fa096a697d0651bbcbe9a0ed93c81285e29cc (patch) | |
| tree | be2355f23bcd6fa4bb73d0d2f7ac6fb5c9473f7b /target/linux/ramips | |
| parent | 08f77d2e7e64fbd17070d17c97979be966dd4b3d (diff) | |
| download | upstream-b98fa096a697d0651bbcbe9a0ed93c81285e29cc.tar.gz upstream-b98fa096a697d0651bbcbe9a0ed93c81285e29cc.tar.bz2 upstream-b98fa096a697d0651bbcbe9a0ed93c81285e29cc.zip | |
ramips: request_irq prior to dma allocation, and handle the case if it fails
SVN-Revision: 18173
Diffstat (limited to 'target/linux/ramips')
| -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 35c44cc52f..fa09caa783 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 |