samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge f60913a38d on remote branch

Browse Source 
Change-Id: Ib69ac8da64b77be3ea11ca3c17e0cb11553efeec
This commit is contained in:
Linux Build Service Account
2024-08-14 07:00:24 -07:00
parent aef65998bd f60913a38d
commit 2e95c836fb
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crypto-qti/qcedev_smmu.c
View File

@@ -344,8 +344,12 @@ int qcedev_check_and_map_buffer(void *handle,
return 0; return 0;
unmap: unmap:
if (!found) if (!found) {
qcedev_unmap_buffer(handle, mem_client, binfo); qcedev_unmap_buffer(handle, mem_client, binfo);
mutex_lock(&qce_hndl->registeredbufs.lock);
list_del(&binfo->list);
mutex_unlock(&qce_hndl->registeredbufs.lock);
}
error: error:
kfree(binfo); kfree(binfo);

5
smcinvoke/smcinvoke.c
View File

@@ -2750,8 +2750,11 @@ start_waiting_for_requests:
} }
} while (!cb_txn); } while (!cb_txn);
out: out:
if (server_info) if (server_info) {
mutex_lock(&g_smcinvoke_lock);
kref_put(&server_info->ref_cnt, destroy_cb_server); kref_put(&server_info->ref_cnt, destroy_cb_server);
mutex_unlock(&g_smcinvoke_lock);
}
if (ret && ret != -ERESTARTSYS) if (ret && ret != -ERESTARTSYS)
pr_err("accept thread returning with ret: %d\n", ret); pr_err("accept thread returning with ret: %d\n", ret);