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

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

Merge "mtd: msm_qpic_nand: Add a check to read an ONFI parameter page"

parents b7284222 c807ca79

drivers/mtd/devices/msm_qpic_nand.c

+4 −2
Original line number Diff line number Diff line
@@ -611,10 +611,12 @@ static int msm_nand_flash_onfi_probe(struct msm_nand_info *info) 
	struct version nandc_version = {0};



	ret = msm_nand_version_check(info, &nandc_version);

	if (!ret && !(nandc_version.nand_major == 1 &&

	if (!ret && !((nandc_version.nand_major == 1 &&

			nandc_version.nand_minor >= 5 &&

			nandc_version.qpic_major == 1 &&

			nandc_version.qpic_minor >= 5)) {

			nandc_version.qpic_minor >= 5) ||

			(nandc_version.nand_major >= 2 &&

			nandc_version.qpic_major >= 2))) {

		ret = -EPERM;

		goto out;

	}