Changeset a36f442 in mainline

Timestamp:

2018-03-13T18:01:48Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

67f11a0

Parents:

aadde10

git-author:

Jakub Jermar <jakub@…> (2018-03-12 17:25:49)

git-committer:

Jakub Jermar <jakub@…> (2018-03-13 18:01:48)

Message:

Account the active call to callerbox if it exists

File:

• kernel/generic/src/ipc/ipc.c (modified) (1 diff)

kernel/generic/src/ipc/ipc.c

@@ -351 +351 @@
         } else {
                 atomic_inc(&phone->active_calls);
-                atomic_inc(&caller->answerbox.active_calls);
+                if (call->callerbox)
+                        atomic_inc(&call->callerbox->active_calls);
+                else
+                        atomic_inc(&caller->answerbox.active_calls);
                 kobject_add_ref(phone->kobject);
                 call->sender = caller;