equal
deleted
inserted
replaced
6358 if (!(adapter->flags & FLAG_HAS_AMT)) |
6358 if (!(adapter->flags & FLAG_HAS_AMT)) |
6359 e1000e_get_hw_control(adapter); |
6359 e1000e_get_hw_control(adapter); |
6360 |
6360 |
6361 adapter->ecdev = ecdev_offer(netdev, ec_poll, THIS_MODULE); |
6361 adapter->ecdev = ecdev_offer(netdev, ec_poll, THIS_MODULE); |
6362 if (adapter->ecdev) { |
6362 if (adapter->ecdev) { |
6363 adapter->ec_watchdog_jiffies = jiffies; |
6363 err = ecdev_open(adapter->ecdev); |
6364 if (ecdev_open(adapter->ecdev)) { |
6364 if (err) { |
6365 ecdev_withdraw(adapter->ecdev); |
6365 ecdev_withdraw(adapter->ecdev); |
6366 goto err_register; |
6366 goto err_register; |
6367 } |
6367 } |
|
6368 adapter->ec_watchdog_jiffies = jiffies; |
6368 } else { |
6369 } else { |
6369 strncpy(netdev->name, "eth%d", sizeof(netdev->name) - 1); |
6370 strncpy(netdev->name, "eth%d", sizeof(netdev->name) - 1); |
6370 err = register_netdev(netdev); |
6371 err = register_netdev(netdev); |
6371 if (err) |
6372 if (err) |
6372 goto err_register; |
6373 goto err_register; |