tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'for-linus-20131025' of git://git.infradead.org/linux-mtd

Pull final mtd fixes from Brian Norris:
"A few more last-minute regression fixes, prepared jointly by me and
David Woodhouse:

- Revert pxa3xx to its old name to avoid breaking existing
'mtdparts=' boot strings.

- Return GPMI NAND to its legacy ECC layout for backwards
compatibility. We will revisit this in 3.13.

A note from David on the latter fix: 'This leaves a harmless cosmetic
warning about an unused function. At this point in the cycle I really
don't care.'"

* tag 'for-linus-20131025' of git://git.infradead.org/linux-mtd:
mtd: gpmi: fix ECC regression
mtd: nand: pxa3xx: Fix registered MTD name

Linus Torvalds d255c59a f55ac56d

+7 -2
+1 -1
drivers/mtd/nand/gpmi-nand/gpmi-nand.c
··· 349 349 350 350 int common_nfc_set_geometry(struct gpmi_nand_data *this) 351 351 { 352 - return set_geometry_by_ecc_info(this) ? 0 : legacy_set_geometry(this); 352 + return legacy_set_geometry(this); 353 353 } 354 354 355 355 struct dma_chan *get_dma_chan(struct gpmi_nand_data *this)
+6 -1
drivers/mtd/nand/pxa3xx_nand.c
··· 1320 1320 for (cs = 0; cs < pdata->num_cs; cs++) { 1321 1321 struct mtd_info *mtd = info->host[cs]->mtd; 1322 1322 1323 - mtd->name = pdev->name; 1323 + /* 1324 + * The mtd name matches the one used in 'mtdparts' kernel 1325 + * parameter. This name cannot be changed or otherwise 1326 + * user's mtd partitions configuration would get broken. 1327 + */ 1328 + mtd->name = "pxa3xx_nand-0"; 1324 1329 info->cs = cs; 1325 1330 ret = pxa3xx_nand_scan(mtd); 1326 1331 if (ret) {