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

Commit 9f8f16c8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mtd/for-4.19-rc2' of git://git.infradead.org/linux-mtd 

Pull mtd fixes from Boris Brezillon:
 "Raw NAND fixes:

   - denali: Fix a regression caused by the nand_scan() rework

   - docg4: Fix a build error when gcc decides to not iniline some
     functions (can be reproduced with gcc 4.1.2):

* tag 'mtd/for-4.19-rc2' of git://git.infradead.org/linux-mtd:
  mtd: rawnand: denali: do not pass zero maxchips to nand_scan()
  mtd: rawnand: docg4: Remove wrong __init annotations
parents 48f8e8e9 336d139f

drivers/mtd/nand/raw/denali.c

+5 −0
Original line number Diff line number Diff line
@@ -1338,6 +1338,11 @@ int denali_init(struct denali_nand_info *denali) 


	denali_enable_irq(denali);

	denali_reset_banks(denali);

	if (!denali->max_banks) {

		/* Error out earlier if no chip is found for some reasons. */

		ret = -ENODEV;

		goto disable_irq;

	}



	denali->active_bank = DENALI_INVALID_BANK;

drivers/mtd/nand/raw/docg4.c

+2 −2
Original line number Diff line number Diff line
@@ -1218,7 +1218,7 @@ static int docg4_resume(struct platform_device *pdev) 
	return 0;

}



static void __init init_mtd_structs(struct mtd_info *mtd)

static void init_mtd_structs(struct mtd_info *mtd)

{

	/* initialize mtd and nand data structures */
@@ -1290,7 +1290,7 @@ static void __init init_mtd_structs(struct mtd_info *mtd) 


}



static int __init read_id_reg(struct mtd_info *mtd)

static int read_id_reg(struct mtd_info *mtd)

{

	struct nand_chip *nand = mtd_to_nand(mtd);

	struct docg4_priv *doc = nand_get_controller_data(nand);