Changes in / [e067dcd:eb73a50] in mainline

Location:

uspace

Files:

• lib/libc/generic/async.c (modified) (2 diffs)
• srv/fs/fat/fat_fat.c (modified) (2 diffs)

uspace/lib/libc/generic/async.c

@@ -1310 +1310 @@
             IPC_FF_ROUTE_FROM_ME);
         if (retval != EOK) {
+                async_wait_for(msg, NULL);
                 ipc_answer_0(callid, retval);
                 return retval;
@@ -1495 +1496 @@
             IPC_FF_ROUTE_FROM_ME);
         if (retval != EOK) {
+                async_wait_for(msg, NULL);
                 ipc_answer_0(callid, retval);
                 return retval;

uspace/srv/fs/fat/fat_fat.c

@@ -361 +361 @@
         uint16_t rscnt;
         uint16_t sf;
-        uint16_t ts;
+        uint32_t ts;
         unsigned rde;
         unsigned rds;
@@ -379 +379 @@
         sf = uint16_t_le2host(bs->sec_per_fat);
         rde = uint16_t_le2host(bs->root_ent_max);
-        ts = uint16_t_le2host(bs->totsec16);
+        ts = (uint32_t) uint16_t_le2host(bs->totsec16);
+        if (ts == 0)
+                ts = uint32_t_le2host(bs->totsec32);
 
         rds = (sizeof(fat_dentry_t) * rde) / bps;