diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-02-27 06:41:17 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-02-27 06:41:17 -0500 |
| commit | ff5a7088f0f04dd246e514f898cab0c863c3598d (patch) | |
| tree | 68a8f588e60fba05ee54b74b32a3269a72d130b9 /drivers/net/ethernet/atheros/alx/main.c | |
| parent | 7e74efcf76c16f851df5c838c143c4a1865ea9fa (diff) | |
| parent | e3703f8cdfcf39c25c4338c3ad8e68891cca3731 (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge the latest fixes before queueing up new changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/atheros/alx/main.c')
| -rw-r--r-- | drivers/net/ethernet/atheros/alx/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c index e92ffd6e1c15..2e45f6ec1bf0 100644 --- a/drivers/net/ethernet/atheros/alx/main.c +++ b/drivers/net/ethernet/atheros/alx/main.c | |||
| @@ -1292,6 +1292,7 @@ static int alx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 1292 | alx = netdev_priv(netdev); | 1292 | alx = netdev_priv(netdev); |
| 1293 | spin_lock_init(&alx->hw.mdio_lock); | 1293 | spin_lock_init(&alx->hw.mdio_lock); |
| 1294 | spin_lock_init(&alx->irq_lock); | 1294 | spin_lock_init(&alx->irq_lock); |
| 1295 | spin_lock_init(&alx->stats_lock); | ||
| 1295 | alx->dev = netdev; | 1296 | alx->dev = netdev; |
| 1296 | alx->hw.pdev = pdev; | 1297 | alx->hw.pdev = pdev; |
| 1297 | alx->msg_enable = NETIF_MSG_LINK | NETIF_MSG_HW | NETIF_MSG_IFUP | | 1298 | alx->msg_enable = NETIF_MSG_LINK | NETIF_MSG_HW | NETIF_MSG_IFUP | |