Changeset 1c6c3e1d in mainline for uspace/app/display-cfg/seats.c

Timestamp:

2023-10-22T17:55:33Z (17 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

ticket/834-toolchain-update

Children:

350ec74

Parents:

315d487 (diff), 133461c (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:

Merge branch 'master' into ticket

File:

• uspace/app/display-cfg/seats.c (modified) (2 diffs)

uspace/app/display-cfg/seats.c

@@ -419 +419 @@
         errno_t rc;
 
-        printf("seats list populate\n");
         rc = dcfg_seats_list_populate(seats);
         if (rc != EOK)
@@ -924 +923 @@
         rc = dispcfg_seat_delete(seats->dcfg->dispcfg, entry->seat_id);
         if (rc != EOK) {
+                /*
+                 * EBUSY is returned when we attempt to delete the last
+                 * seat. No need to complain about it.
+                 */
+                if (rc == EBUSY)
+                        return;
+
                 printf("Error removing seat '%s'.\n", entry->name);
                 return;