Commit 9584987f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mtd/fixes-for-6.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux 

Pull mtd fixes from Miquel Raynal:

 - Placate "$VARIABLE is used uninitialized" warnings

 - omap2: Add missing dependency on GPMC

 - qcom: Handle ret from parse with codeword_fixup

* tag 'mtd/fixes-for-6.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux:
  mtd: onenand: omap2: add dependency on GPMC
  mtd: rawnand: placate "$VARIABLE is used uninitialized" warnings
  mtd: rawnand: qcom: handle ret from parse with codeword_fixup
parents 094226ad c717b9b7

drivers/mtd/nand/onenand/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ config MTD_ONENAND_OMAP2 
	tristate "OneNAND on OMAP2/OMAP3 support"

	depends on ARCH_OMAP2 || ARCH_OMAP3 || (COMPILE_TEST && ARM)

	depends on OF || COMPILE_TEST

	depends on OMAP_GPMC

	help

	  Support for a OneNAND flash device connected to an OMAP2/OMAP3 SoC

	  via the GPMC memory controller.

drivers/mtd/nand/raw/nand_base.c

+2 −2
Original line number Diff line number Diff line
@@ -5834,7 +5834,7 @@ nand_match_ecc_req(struct nand_chip *chip, 
	int req_step = requirements->step_size;

	int req_strength = requirements->strength;

	int req_corr, step_size, strength, nsteps, ecc_bytes, ecc_bytes_total;

	int best_step, best_strength, best_ecc_bytes;

	int best_step = 0, best_strength = 0, best_ecc_bytes = 0;

	int best_ecc_bytes_total = INT_MAX;

	int i, j;
@@ -5915,7 +5915,7 @@ nand_maximize_ecc(struct nand_chip *chip, 
	int step_size, strength, nsteps, ecc_bytes, corr;

	int best_corr = 0;

	int best_step = 0;

	int best_strength, best_ecc_bytes;

	int best_strength = 0, best_ecc_bytes = 0;

	int i, j;



	for (i = 0; i < caps->nstepinfos; i++) {

drivers/mtd/nand/raw/qcom_nandc.c

+7 −5
Original line number Diff line number Diff line
@@ -3167,16 +3167,18 @@ static int qcom_nand_host_init_and_register(struct qcom_nand_controller *nandc, 


	ret = mtd_device_parse_register(mtd, probes, NULL, NULL, 0);

	if (ret)

		nand_cleanup(chip);

		goto err;



	if (nandc->props->use_codeword_fixup) {

		ret = qcom_nand_host_parse_boot_partitions(nandc, host, dn);

		if (ret) {

			nand_cleanup(chip);

			return ret;

		}

		if (ret)

			goto err;

	}



	return 0;



err:

	nand_cleanup(chip);

	return ret;

}