Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4df9b763 authored by Lingutla Chandrasekhar's avatar Lingutla Chandrasekhar
Browse files

msm_11ad: reorder registration with memory dump table 



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: default avatarLingutla Chandrasekhar <clingutla@codeaurora.org>
parent 7f0d77b3

drivers/platform/msm/msm_11ad/msm_11ad.c

+9 −10
Original line number Diff line number Diff line
@@ -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;