projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: thunderx: Wait for delayed work to finish before destroying it
[deliverable/linux.git]
/
drivers
/
net
/
ethernet
/
cavium
/
thunder
/
thunder_bgx.c
diff --git
a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
index 180aa9fabf4820df042f18cba8c39d5ce1668e9d..6534b73620911728edb120fbd8129864250f2684 100644
(file)
--- a/
drivers/net/ethernet/cavium/thunder/thunder_bgx.c
+++ b/
drivers/net/ethernet/cavium/thunder/thunder_bgx.c
@@
-695,8
+695,7
@@
static void bgx_lmac_disable(struct bgx *bgx, u8 lmacid)
lmac = &bgx->lmac[lmacid];
if (lmac->check_link) {
/* Destroy work queue */
lmac = &bgx->lmac[lmacid];
if (lmac->check_link) {
/* Destroy work queue */
- cancel_delayed_work(&lmac->dwork);
- flush_workqueue(lmac->check_link);
+ cancel_delayed_work_sync(&lmac->dwork);
destroy_workqueue(lmac->check_link);
}
destroy_workqueue(lmac->check_link);
}
@@
-1009,6
+1008,9
@@
static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
struct bgx *bgx = NULL;
u8 lmac;
struct bgx *bgx = NULL;
u8 lmac;
+ /* Load octeon mdio driver */
+ octeon_mdiobus_force_mod_depencency();
+
bgx = devm_kzalloc(dev, sizeof(*bgx), GFP_KERNEL);
if (!bgx)
return -ENOMEM;
bgx = devm_kzalloc(dev, sizeof(*bgx), GFP_KERNEL);
if (!bgx)
return -ENOMEM;
This page took
0.025126 seconds
and
5
git commands to generate.