sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

graphics/vnc/server: Fix an error in the VNC server introduced with recent big set of changes.

Browse Source
This commit is contained in:
Gregory Nutt 2017-10-07 08:30:50 -06:00
parent 9e25d89223
commit 10e7105900
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
graphics/vnc/server/vnc_fbdev.c
View File

@ -538,7 +538,7 @@ static inline int vnc_wait_start(int display)
static inline int vnc_wait_connect(int display) static inline int vnc_wait_connect(int display)
{ {
int errcode; int errcode;
int result; int ret;
/* Check if there has been a session allocated yet. This is one of the /* Check if there has been a session allocated yet. This is one of the
* first things that the VNC server will do with the kernel thread is * first things that the VNC server will do with the kernel thread is
@ -581,14 +581,14 @@ static inline int vnc_wait_connect(int display)
* counting semaphore screw-up? * counting semaphore screw-up?
*/ */
result = g_fbstartup[display].result; ret = g_fbstartup[display].result;
if (result != -EBUSY) if (ret != -EBUSY)
{ {
#ifdef CONFIG_DEBUG_FEATURES #ifdef CONFIG_DEBUG_FEATURES
if (result < 0) if (ret < 0)
{ {
DEBUGASSERT(g_vnc_sessions[display] == NULL); DEBUGASSERT(g_vnc_sessions[display] == NULL);
gerr("ERROR: VNC server startup failed: %d\n", result); gerr("ERROR: VNC server startup failed: %d\n", ret);
} }
else else
{ {
@ -596,7 +596,7 @@ static inline int vnc_wait_connect(int display)
g_vnc_sessions[display]->state == VNCSERVER_RUNNING); g_vnc_sessions[display]->state == VNCSERVER_RUNNING);
} }
#endif #endif
return result; return ret;
} }
} }