equal
deleted
inserted
replaced
6067 if (!(adapter->flags & FLAG_HAS_AMT)) |
6067 if (!(adapter->flags & FLAG_HAS_AMT)) |
6068 e1000_get_hw_control(adapter); |
6068 e1000_get_hw_control(adapter); |
6069 |
6069 |
6070 adapter->ecdev = ecdev_offer(netdev, ec_poll, THIS_MODULE); |
6070 adapter->ecdev = ecdev_offer(netdev, ec_poll, THIS_MODULE); |
6071 if (adapter->ecdev) { |
6071 if (adapter->ecdev) { |
6072 adapter->ec_watchdog_jiffies = jiffies; |
6072 err = ecdev_open(adapter->ecdev); |
6073 if (ecdev_open(adapter->ecdev)) { |
6073 if (err) { |
6074 ecdev_withdraw(adapter->ecdev); |
6074 ecdev_withdraw(adapter->ecdev); |
6075 goto err_register; |
6075 goto err_register; |
6076 } |
6076 } |
|
6077 adapter->ec_watchdog_jiffies = jiffies; |
6077 } else { |
6078 } else { |
6078 strcpy(netdev->name, "eth%d"); |
6079 strcpy(netdev->name, "eth%d"); |
6079 err = register_netdev(netdev); |
6080 err = register_netdev(netdev); |
6080 if (err) |
6081 if (err) |
6081 goto err_register; |
6082 goto err_register; |