Changeset ff381a7 in mainline for uspace/srv/devman/driver.c

Timestamp:

2015-11-02T20:54:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/srv/devman/driver.c (modified) (4 diffs)

uspace/srv/devman/driver.c

@@ -36 +36 @@
 #include <sys/stat.h>
 #include <io/log.h>
-#include <ipc/driver.h>
 #include <loc.h>
 #include <str_error.h>
@@ -143 +142 @@
         /* Check whether the driver's binary exists. */
         struct stat s;
-        if (stat(drv->binary_path, &s) == ENOENT) { /* FIXME!! */
+        if (stat(drv->binary_path, &s) != 0) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Driver not found at path `%s'.",
                     drv->binary_path);
@@ -573 +572 @@
         
         if (rc != EOK) {
-                /* TODO handle error */
-        }
-
-        /* Wait for answer from the driver. */
-        async_wait_for(req, &rc);
-
-        switch(rc) {
+                async_forget(req);
+        } else {
+                /* Wait for answer from the driver. */
+                async_wait_for(req, &rc);
+        }
+
+        switch (rc) {
         case EOK:
                 dev->state = DEVICE_USABLE;
@@ -592 +591 @@
         
         dev->passed_to_driver = true;
-
-        return;
 }