apps_user: domain_deinit: remove unncessary stack variable
BUG=b:137202421
TEST=Tested label_image overnight
Change-Id: I0324448d0dfe3f386d91947c9c12c9475c2af7f1
Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
Signed-off-by: Abhinav Asati <asatiabhi@codeaurora.org>
Reviewed-on: https://chromium-review.googlesource.com/1741757
Tested-by: Julan Hsu <julanhsu@google.com>
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Zhihong Yu <zhihongyu@chromium.org>
Reviewed-by: Julan Hsu <julanhsu@google.com>
diff --git a/src/fastrpc_apps_user.c b/src/fastrpc_apps_user.c
index ff4a7f2..0a435c6 100644
--- a/src/fastrpc_apps_user.c
+++ b/src/fastrpc_apps_user.c
@@ -1322,15 +1322,14 @@
static void domain_deinit(int domain) {
QNode *pn;
- int olddev;
remote_handle64 handle;
if(!hlist) {
return;
}
- olddev = hlist[domain].dev;
- FARF(HIGH, "domain_deinit for domain %d: dev %d \n", domain, olddev);
- if(olddev != -1) {
+
+ FARF(HIGH, "domain_deinit for domain %d: dev %d \n", domain, hlist[domain].dev);
+ if(hlist[domain].dev != -1) {
handle = get_adsp_current_process1_handle(domain);
if(handle != INVALID_HANDLE) {
adsp_current_process1_exit(handle);
@@ -1351,15 +1350,19 @@
hlist[domain].domainsupport = 0;
hlist[domain].nondomainsupport = 0;
hlist[domain].initialized = 0;
- hlist[domain].dev = -1;
hlist[domain].dsppd = attach_guestos(domain);
if (hlist[domain].dsppdname != NULL)
{
free(hlist[domain].dsppdname);
hlist[domain].dsppdname = NULL;
}
+
FARF(HIGH, "exit: closing %d, rpc errors are expected.\n", domain);
- close(olddev);
+
+ if (close(hlist[domain].dev))
+ FARF(ERROR, "exit: failed to close file descriptor for domain %d\n", domain);
+
+ hlist[domain].dev = -1;
}
if(hlist[domain].pdmem) {
rpcmem_free_internal(hlist[domain].pdmem);