Changeset e5424e9 in mainline for uspace/drv/nic/e1k/e1k.c

Timestamp:

2014-07-18T08:50:36Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ebc9c2c

Parents:

869d936

Message:

Defer connecting IRC service until actually needed. This allows the driver to be loaded even in its absence.

File:

• uspace/drv/nic/e1k/e1k.c (modified) (2 diffs)

uspace/drv/nic/e1k/e1k.c

@@ -1756 +1756 @@
         e1000_enable_interrupts(e1000);
         
-        irc_enable_interrupt(e1000->irq);
+        int rc = irc_enable_interrupt(e1000->irq);
+        if (rc != EOK) {
+                e1000_disable_interrupts(e1000);
+                fibril_mutex_unlock(&e1000->ctrl_lock);
+                fibril_mutex_unlock(&e1000->tx_lock);
+                fibril_mutex_unlock(&e1000->rx_lock);
+                return rc;
+        }
         
         e1000_clear_rx_ring(e1000);
@@ -2375 +2382 @@
         printf("%s: HelenOS E1000 network adapter driver\n", NAME);
         
-        if (irc_init() != EOK) {
-                printf("%s: Failed connecting IRC service\n", NAME);
-                return 1;
-        }
-        
         if (nic_driver_init(NAME) != EOK)
                 return 1;