Changeset f9d0a86 in mainline for kernel/generic/src/ipc/sysipc.c

Timestamp:

2017-11-14T12:24:42Z (6 years ago)

Author:

Aearsis <Hlavaty.Ondrej@…>

Branches:

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

Children:

6cad776

Parents:

887c9de (diff), d2d142a (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.

git-author:

Aearsis <Hlavaty.Ondrej@…> (2017-11-14 01:04:19)

git-committer:

Aearsis <Hlavaty.Ondrej@…> (2017-11-14 12:24:42)

Message:

Merge tag '0.7.1'

The merge wasn't clean, because of changes in build system. The most
significant change was partial revert of usbhc callback refactoring,
which now does not take usb transfer batch, but few named fields again.

File:

• kernel/generic/src/ipc/sysipc.c (modified) (4 diffs)

kernel/generic/src/ipc/sysipc.c

@@ -199 +199 @@
                         irq_spinlock_lock(&phone->callee->lock, true);
                         list_remove(&phone->link);
+                        /* Drop callee->connected_phones reference */
+                        kobject_put(phone->kobject);
                         phone->state = IPC_PHONE_SLAMMED;
                         irq_spinlock_unlock(&phone->callee->lock, true);
@@ -357 +359 @@
  * @return Call hash on success.
  * @return IPC_CALLRET_FATAL in case of a fatal error.
- * @return IPC_CALLRET_TEMPORARY if there are too many pending
- *         asynchronous requests; answers should be handled first.
  *
  */
@@ -370 +370 @@
         if (check_call_limit(kobj->phone)) {
                 kobject_put(kobj);
-                return IPC_CALLRET_TEMPORARY;
+                return IPC_CALLRET_FATAL;
         }
         
@@ -413 +413 @@
         if (check_call_limit(kobj->phone)) {
                 kobject_put(kobj);
-                return IPC_CALLRET_TEMPORARY;
+                return IPC_CALLRET_FATAL;
         }