Commit 96853064 authored Dec 05, 2007 by Benjamin Herrenschmidt Committed by Jeff Garzik Dec 07, 2007

ibm_newemac: Fix ZMII refcounting bug



When using ZMII for MDIO only (such as 440GX with RGMII for data and ZMII for
MDIO), the ZMII code would fail to properly refcount, thus triggering a
BUG_ON().

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Stefan Roese <sr@denx.de>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

parent 8df4538e

drivers/net/ibm_newemac/zmii.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -83,12 +83,14 @@ int __devinit zmii_attach(struct of_device ofdev, int input, int mode)

		ZMII_DBG(dev, "init(%d, %d)" NL, input, *mode);

		if (!zmii_valid_mode(*mode))
		if (!zmii_valid_mode(*mode)) {
		/* Probably an EMAC connected to RGMII,
		* but it still may need ZMII for MDIO so
		* we don't fail here.
		*/
		dev->users++;
		return 0;
		}

		mutex_lock(&dev->lock);

Admin message