Changeset 94e46c9 in mainline for uspace/drv/bus/isa/isa.c

Timestamp:

2015-05-23T04:09:11Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b5143bd

Parents:

a25d893 (diff), 0683992 (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:

Mainline changes

File:

• uspace/drv/bus/isa/isa.c (modified) (2 diffs)

uspace/drv/bus/isa/isa.c

@@ -245 +245 @@
         bool opened = false;
         int fd;
-        size_t len = 0;
+        size_t len;
+        ssize_t r;
 
         fd = open(conf_path, O_RDONLY);
@@ -269 +270 @@
         }
 
-        if (0 >= read(fd, buf, len)) {
+        r = read_all(fd, buf, len);
+        if (r < 0) {
                 ddf_msg(LVL_ERROR, "Unable to read file '%s'.", conf_path);
                 goto cleanup;