korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-04 09:34:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

net: mdio-mux: fix unbalanced put_device

Browse Source 
mdio_mux_uninit() call put_device (unconditionally) because of
of_mdio_find_bus() in mdio_mux_init.
But of_mdio_find_bus is only called if mux_bus is empty.
If mux_bus is set, mdio_mux_uninit will print a "refcount_t: underflow"
trace.

This patch add a get_device in the other branch of "if (mux_bus)".

Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Corentin Labbe 2017-09-01 13:56:04 +02:00 committed by David S. Miller
parent c642bbbc72
commit 60f7865250
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/phy/mdio-mux.c
View File

@ -116,6 +116,7 @@ int mdio_mux_init(struct device *dev,
} else { } else {
parent_bus_node = NULL; parent_bus_node = NULL;
parent_bus = mux_bus; parent_bus = mux_bus;
get_device(&parent_bus->dev);
} }
pb = devm_kzalloc(dev, sizeof(*pb), GFP_KERNEL); pb = devm_kzalloc(dev, sizeof(*pb), GFP_KERNEL);
@ -184,9 +185,7 @@ int mdio_mux_init(struct device *dev,
dev_err(dev, "Error: No acceptable child buses found\n"); dev_err(dev, "Error: No acceptable child buses found\n");
devm_kfree(dev, pb); devm_kfree(dev, pb);
err_pb_kz: err_pb_kz:
/* balance the reference of_mdio_find_bus() took */ put_device(&parent_bus->dev);
if (!mux_bus)
put_device(&parent_bus->dev);
err_parent_bus: err_parent_bus:
of_node_put(parent_bus_node); of_node_put(parent_bus_node);
return ret_val; return ret_val;
@ -204,7 +203,6 @@ void mdio_mux_uninit(void *mux_handle)
cb = cb->next; cb = cb->next;
} }
/* balance the reference of_mdio_find_bus() in mdio_mux_init() took */
put_device(&pb->mii_bus->dev); put_device(&pb->mii_bus->dev);
} }
EXPORT_SYMBOL_GPL(mdio_mux_uninit); EXPORT_SYMBOL_GPL(mdio_mux_uninit);