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

Merge "msm_11ad: reorder registration with memory dump table"

Browse source
This commit is contained in:
Linux Build Service Account 2017-04-24 06:47:52 -07:00 • committed by Gerrit - the friendly Code Review server
commit 39b4e0837f
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

@ -836,7 +836,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) {
@ -869,6 +868,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) {
@ -886,19 +893,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;