evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

msm_11ad: reorder registration with memory dump table

Browse source 
Memory dump table doesn't support de registration, but
when ssr ramdump device creation failed, it frees
the buffer registered with Memory dump table also.

So re-order ramdump device creation to avoid freeing
memory dump table buffer.

Change-Id: I0ac595259159f3d3fe2e5c864dae8a6a1d6b4078
Signed-off-by: Lingutla Chandrasekhar <clingutla@codeaurora.org>
This commit is contained in:
Lingutla Chandrasekhar 2017-04-18 15:59:18 +05:30
parent 7f0d77b390
commit 4df9b7635e
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/platform/msm/msm_11ad/msm_11ad.c
View file

@ -822,7 +822,6 @@ static void msm_11ad_ssr_deinit(struct msm11ad_ctx *ctx)
ctx->ramdump_dev = NULL;
}
kfree(ctx->ramdump_addr);
ctx->ramdump_addr = NULL;
if (ctx->subsys_handle) {
@ -855,6 +854,14 @@ static int msm_11ad_ssr_init(struct msm11ad_ctx *ctx)
goto out_rc;
}
ctx->ramdump_dev = create_ramdump_device(ctx->subsysdesc.name,
ctx->subsysdesc.dev);
if (!ctx->ramdump_dev) {
dev_err(ctx->dev, "Create ramdump device failed\n");
rc = -ENOMEM;
goto out_rc;
}
/* register ramdump area */
ctx->ramdump_addr = kmalloc(WIGIG_RAMDUMP_SIZE, GFP_KERNEL);
if (!ctx->ramdump_addr) {
@ -870,19 +877,11 @@ static int msm_11ad_ssr_init(struct msm11ad_ctx *ctx)
rc = msm_dump_data_register(MSM_DUMP_TABLE_APPS, &dump_entry);
if (rc) {
dev_err(ctx->dev, "Dump table setup failed: %d\n", rc);
goto out_rc;
}
ctx->ramdump_dev = create_ramdump_device(ctx->subsysdesc.name,
ctx->subsysdesc.dev);
if (!ctx->ramdump_dev) {
dev_err(ctx->dev, "Create ramdump device failed: %d\n", rc);
rc = -ENOMEM;
kfree(ctx->ramdump_addr);
goto out_rc;
}
return 0;
out_rc:
msm_11ad_ssr_deinit(ctx);
return rc;