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

Commit a5332810 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: mem-offline: Fix NULL dereference error"

parents 3a40129f a81a12ec

drivers/soc/qcom/mem-offline.c

+6 −2
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static int mem_event_callback(struct notifier_block *self, 
static int mem_online_remaining_blocks(void)

{

	unsigned long memblock_end_pfn = __phys_to_pfn(memblock_end_of_DRAM());

	unsigned long ram_end_pfn = __phys_to_pfn(bootloader_memory_limit);

	unsigned long ram_end_pfn = __phys_to_pfn(bootloader_memory_limit - 1);

	unsigned long block_size, memblock, pfn;

	unsigned int nid;

	phys_addr_t phys_addr;
@@ -316,10 +316,14 @@ static int mem_parse_dt(struct platform_device *pdev) 
	struct device_node *node = pdev->dev.of_node;



	val = of_get_property(node, "granule", NULL);

	if (!val && !*val) {

	if (!val) {

		pr_err("mem-offine: granule property not found in DT\n");

		return -EINVAL;

	}

	if (!*val) {

		pr_err("mem-offine: invalid granule property\n");

		return -EINVAL;

	}

	offline_granule = be32_to_cpup(val);

	if (!offline_granule && !(offline_granule & (offline_granule - 1)) &&

			offline_granule * SZ_1M < MIN_MEMORY_BLOCK_SIZE) {