Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 906edee9 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-bgmac-Couple-of-small-bgmac-changes' 



Florian Fainelli says:

====================
net: bgmac: Couple of small bgmac changes

This patch series addresses two minor issues with the bgmac driver:

- provides the interface name through /proc/interrupts rather than "bgmac"
- makes sure the interrupts are masked during probe, in case the block was
  not properly reset
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 36fc2d72 34322615

drivers/net/ethernet/broadcom/bgmac.c

+3 −1
Original line number Diff line number Diff line
@@ -1190,7 +1190,7 @@ static int bgmac_open(struct net_device *net_dev) 
	bgmac_chip_init(bgmac);



	err = request_irq(bgmac->irq, bgmac_interrupt, IRQF_SHARED,

			  KBUILD_MODNAME, net_dev);

			  net_dev->name, net_dev);

	if (err < 0) {

		dev_err(bgmac->dev, "IRQ request error: %d!\n", err);

		bgmac_dma_cleanup(bgmac);
@@ -1492,6 +1492,8 @@ int bgmac_enet_probe(struct bgmac *bgmac) 
	struct net_device *net_dev = bgmac->net_dev;

	int err;



	bgmac_chip_intrs_off(bgmac);



	net_dev->irq = bgmac->irq;

	SET_NETDEV_DEV(net_dev, bgmac->dev);

	dev_set_drvdata(bgmac->dev, bgmac);