Changeset 8630748 in mainline for uspace/srv/hid/display

Timestamp:

2020-06-24T22:43:00Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

78445be8

Parents:

62018a0

Message:

Handle attempt to launch second display server gracefully

Location:

uspace/srv/hid/display

Files:

• main.c (modified) (1 diff)
• output.c (modified) (1 diff)

uspace/srv/hid/display/main.c

@@ -121 +121 @@
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server: %s.", str_error(rc));
                 rc = EEXIST;
+                goto error;
         }
 

uspace/srv/hid/display/output.c

@@ -163 +163 @@
         fibril_mutex_unlock(&output->lock);
 
+        /* Fail if we did not open at least one device */
+        if (list_empty(&output->ddevs)) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "No output device found.");
+                return ENOENT;
+        }
+
         return rc;
 }