Changeset 7e38970d in mainline for uspace/lib/display/src/display.c

Timestamp:

2020-12-07T00:08:37Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

25f26600

Parents:

7a873f0 (diff), 8596474 (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 'jxsvoboda-gfx' into master

File:

• uspace/lib/display/src/display.c (modified) (3 diffs)

uspace/lib/display/src/display.c

@@ -38 +38 @@
 #include <mem.h>
 #include <stdlib.h>
+#include "../private/display.h"
 #include "../private/params.h"
 
@@ -198 +199 @@
 /** Destroy display window.
  *
- * @param window Window
+ * @param window Window or @c NULL
  * @return EOK on success or an error code. In both cases @a window must
  *         not be accessed anymore
@@ -206 +207 @@
         async_exch_t *exch;
         errno_t rc;
+
+        if (window == NULL)
+                return EOK;
 
         exch = async_exchange_begin(window->display->sess);