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

Commit 13e75329 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mtd: msm_qpic_nand: Use smem_get_entry_to_proc()"

parents 1caf8504 94dd9dd1

drivers/mtd/devices/msm_qpic_nand.c

+4 −2
Original line number Diff line number Diff line
@@ -2842,7 +2842,8 @@ static int msm_nand_parse_smem_ptable(int *nr_parts) 
	pr_info("Parsing partition table info from SMEM\n");

	/* Read only the header portion of ptable */

	ptable = *(struct flash_partition_table *)

			(smem_get_entry(SMEM_AARM_PARTITION_TABLE, &len));

			(smem_get_entry_to_proc(SMEM_AARM_PARTITION_TABLE, &len,

							0, SMEM_ANY_HOST_FLAG));

	/* Verify ptable magic */

	if (ptable.magic1 != FLASH_PART_MAGIC1 ||

			ptable.magic2 != FLASH_PART_MAGIC2) {
@@ -2868,7 +2869,8 @@ static int msm_nand_parse_smem_ptable(int *nr_parts) 


	*nr_parts = ptable.numparts;

	ptable = *(struct flash_partition_table *)

			(smem_get_entry(SMEM_AARM_PARTITION_TABLE, &len));

			(smem_get_entry_to_proc(SMEM_AARM_PARTITION_TABLE, &len,

							0, SMEM_ANY_HOST_FLAG));

	for (i = 0; i < ptable.numparts; i++) {

		pentry = &ptable.part_entry[i];

		if (pentry->name == '\0')