diff options
| -rw-r--r-- | drivers/net/ethernet/broadcom/bgmac.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c index 8eef9fb6b1fe..2326cc219c46 100644 --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c | |||
| @@ -1190,7 +1190,7 @@ static int bgmac_open(struct net_device *net_dev) | |||
| 1190 | bgmac_chip_init(bgmac); | 1190 | bgmac_chip_init(bgmac); |
| 1191 | 1191 | ||
| 1192 | err = request_irq(bgmac->irq, bgmac_interrupt, IRQF_SHARED, | 1192 | err = request_irq(bgmac->irq, bgmac_interrupt, IRQF_SHARED, |
| 1193 | KBUILD_MODNAME, net_dev); | 1193 | net_dev->name, net_dev); |
| 1194 | if (err < 0) { | 1194 | if (err < 0) { |
| 1195 | dev_err(bgmac->dev, "IRQ request error: %d!\n", err); | 1195 | dev_err(bgmac->dev, "IRQ request error: %d!\n", err); |
| 1196 | bgmac_dma_cleanup(bgmac); | 1196 | bgmac_dma_cleanup(bgmac); |
| @@ -1492,6 +1492,8 @@ int bgmac_enet_probe(struct bgmac *bgmac) | |||
| 1492 | struct net_device *net_dev = bgmac->net_dev; | 1492 | struct net_device *net_dev = bgmac->net_dev; |
| 1493 | int err; | 1493 | int err; |
| 1494 | 1494 | ||
| 1495 | bgmac_chip_intrs_off(bgmac); | ||
| 1496 | |||
| 1495 | net_dev->irq = bgmac->irq; | 1497 | net_dev->irq = bgmac->irq; |
| 1496 | SET_NETDEV_DEV(net_dev, bgmac->dev); | 1498 | SET_NETDEV_DEV(net_dev, bgmac->dev); |
| 1497 | dev_set_drvdata(bgmac->dev, bgmac); | 1499 | dev_set_drvdata(bgmac->dev, bgmac); |
