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

Merge "dataipa: avoid accessing NULL pointer"

Browse Source
This commit is contained in:
qctecmdr
2023-02-02 17:25:44 -08:00
committed by Gerrit - the friendly Code Review server
parent b17f4711fd 79759098f5
commit f611a1cb97
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/platform/msm/gsi/gsi.c
View File

@@ -1399,7 +1399,9 @@ static int __gsi_request_msi_irq(unsigned long msi)
static int __gsi_allocate_msis(void) static int __gsi_allocate_msis(void)
{ {
int result = 0; int result = 0;
#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0))
struct msi_desc *desc = NULL; struct msi_desc *desc = NULL;
#endif
size_t size = 0; size_t size = 0;
/* Allocate all MSIs */ /* Allocate all MSIs */
@@ -1419,7 +1421,6 @@ static int __gsi_allocate_msis(void)
for (unsigned long msi = 0; msi < gsi_ctx->msi.num; msi++) { for (unsigned long msi = 0; msi < gsi_ctx->msi.num; msi++) {
/* Save IRQ */ /* Save IRQ */
gsi_ctx->msi.irq[msi] = msi_get_virq(gsi_ctx->dev, msi); gsi_ctx->msi.irq[msi] = msi_get_virq(gsi_ctx->dev, msi);
GSIDBG("desc->irq =%d\n", desc->irq);
#else #else
for_each_msi_entry(desc, gsi_ctx->dev) { for_each_msi_entry(desc, gsi_ctx->dev) {
unsigned long msi = desc->platform.msi_index; unsigned long msi = desc->platform.msi_index;