diff options
Diffstat (limited to 'drivers/net/myri10ge/myri10ge.c')
-rw-r--r-- | drivers/net/myri10ge/myri10ge.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index d320bbeeeff..b8f57df1091 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c | |||
@@ -2620,9 +2620,10 @@ static u32 myri10ge_read_reboot(struct myri10ge_priv *mgp) | |||
2620 | * This watchdog is used to check whether the board has suffered | 2620 | * This watchdog is used to check whether the board has suffered |
2621 | * from a parity error and needs to be recovered. | 2621 | * from a parity error and needs to be recovered. |
2622 | */ | 2622 | */ |
2623 | static void myri10ge_watchdog(void *arg) | 2623 | static void myri10ge_watchdog(struct work_struct *work) |
2624 | { | 2624 | { |
2625 | struct myri10ge_priv *mgp = arg; | 2625 | struct myri10ge_priv *mgp = |
2626 | container_of(work, struct myri10ge_priv, watchdog_work); | ||
2626 | u32 reboot; | 2627 | u32 reboot; |
2627 | int status; | 2628 | int status; |
2628 | u16 cmd, vendor; | 2629 | u16 cmd, vendor; |
@@ -2892,7 +2893,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
2892 | (unsigned long)mgp); | 2893 | (unsigned long)mgp); |
2893 | 2894 | ||
2894 | SET_ETHTOOL_OPS(netdev, &myri10ge_ethtool_ops); | 2895 | SET_ETHTOOL_OPS(netdev, &myri10ge_ethtool_ops); |
2895 | INIT_WORK(&mgp->watchdog_work, myri10ge_watchdog, mgp); | 2896 | INIT_WORK(&mgp->watchdog_work, myri10ge_watchdog); |
2896 | status = register_netdev(netdev); | 2897 | status = register_netdev(netdev); |
2897 | if (status != 0) { | 2898 | if (status != 0) { |
2898 | dev_err(&pdev->dev, "register_netdev failed: %d\n", status); | 2899 | dev_err(&pdev->dev, "register_netdev failed: %d\n", status); |