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

Commit f372f440 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: msm_smem: Pass device structure to ramdump driver" into msm-4.9

parents 53e9c339 4de82316

drivers/soc/qcom/msm_smem.c

+4 −2
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ static int spinlocks_initialized; 
static void *smem_ramdump_dev;

static DEFINE_MUTEX(spinlock_init_lock);

static DEFINE_SPINLOCK(smem_init_check_lock);

static struct device *smem_dev;

static int smem_module_inited;

static RAW_NOTIFIER_HEAD(smem_module_init_notifier_list);

static DEFINE_MUTEX(smem_module_init_notifier_lock);
@@ -1084,7 +1085,8 @@ static __init int modem_restart_late_init(void) 
	void *handle;

	struct restart_notifier_block *nb;



	smem_ramdump_dev = create_ramdump_device("smem", NULL);

	if (smem_dev)

		smem_ramdump_dev = create_ramdump_device("smem", smem_dev);

	if (IS_ERR_OR_NULL(smem_ramdump_dev)) {

		LOG_ERR("%s: Unable to create smem ramdump device.\n",

			__func__);
@@ -1509,7 +1511,7 @@ static int msm_smem_probe(struct platform_device *pdev) 
		SMEM_INFO("smem security enabled\n");

		smem_init_security();

	}



	smem_dev = &pdev->dev;

	probe_done = true;



	ret = of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev);