Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+7
-2
+5
drivers/mtd/nand/raw/denali.c
+5
drivers/mtd/nand/raw/denali.c
···
1338
1338
1339
1339
denali_enable_irq(denali);
1340
1340
denali_reset_banks(denali);
1341
+
if (!denali->max_banks) {
1342
+
/* Error out earlier if no chip is found for some reasons. */
1343
+
ret = -ENODEV;
1344
+
goto disable_irq;
1345
+
}
1341
1346
1342
1347
denali->active_bank = DENALI_INVALID_BANK;
1343
1348
+2
-2
drivers/mtd/nand/raw/docg4.c
+2
-2
drivers/mtd/nand/raw/docg4.c
···
1218
1218
return 0;
1219
1219
}
1220
1220
1221
-
static void __init init_mtd_structs(struct mtd_info *mtd)
1221
+
static void init_mtd_structs(struct mtd_info *mtd)
1222
1222
{
1223
1223
/* initialize mtd and nand data structures */
1224
1224
···
1290
1290
1291
1291
}
1292
1292
1293
-
static int __init read_id_reg(struct mtd_info *mtd)
1293
+
static int read_id_reg(struct mtd_info *mtd)
1294
1294
{
1295
1295
struct nand_chip *nand = mtd_to_nand(mtd);
1296
1296
struct docg4_priv *doc = nand_get_controller_data(nand);