git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'work.misc' and 'work.dcache' of git://git.kernel.org/pub/scm/linux...
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
ethernet
/
huawei
/
hinic
/
hinic_main.c
diff --git
a/drivers/net/ethernet/huawei/hinic/hinic_main.c
b/drivers/net/ethernet/huawei/hinic/hinic_main.c
index 5b122728dcb472c9f9849cb2a82a08e5b4917cca..09e9da10b786549b6232d8069c4e45857b95fd8c 100644
(file)
--- a/
drivers/net/ethernet/huawei/hinic/hinic_main.c
+++ b/
drivers/net/ethernet/huawei/hinic/hinic_main.c
@@
-983,6
+983,7
@@
static int nic_dev_init(struct pci_dev *pdev)
hinic_hwdev_cb_register(nic_dev->hwdev, HINIC_MGMT_MSG_CMD_LINK_STATUS,
nic_dev, link_status_event_handler);
+ SET_NETDEV_DEV(netdev, &pdev->dev);
err = register_netdev(netdev);
if (err) {
dev_err(&pdev->dev, "Failed to register netdev\n");