History

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

Pull MTD fixes from Brian Norris: "Two MTD fixes, for the pxa3xx-nand driver: - This driver was not ready to fully Armada 370 NAND, with particularly notable problems seen on flash with 2KB page sizes. This "compatible" entry really should have been held back until 3.14 or later. - Fix a bug seen in rare cases on the error path of a failed probe attempt, where we free unallocated DMA resources" * tag 'for-linus-20131212' of git://git.infradead.org/linux-mtd: mtd: nand: pxa3xx: Use info->use_dma to release DMA resources Partially revert "mtd: nand: pxa3xx: Introduce 'marvell,armada370-nand' compatible string"

Linus Torvalds committed 12 years ago

Commit dbb022c2 parents f649350 15b540c1 file · +1 −5Browse files

Unified · Split

drivers/mtd/nand/pxa3xx_nand.c+1−5
@@ -962,7 +962,7 @@ static int pxa3xx_nand_init_buff(struct pxa3xx_nand_info *info) · 961 unmodified lines
962static void pxa3xx_nand_free_buff(struct pxa3xx_nand_info *info)962static void pxa3xx_nand_free_buff(struct pxa3xx_nand_info *info)
963{963{
964 struct platform_device *pdev = info->pdev;964 struct platform_device *pdev = info->pdev;
965 if (use_dma) {965 if (info->use_dma) {
966 pxa_free_dma(info->data_dma_ch);966 pxa_free_dma(info->data_dma_ch);
967 dma_free_coherent(&pdev->dev, info->buf_size,967 dma_free_coherent(&pdev->dev, info->buf_size,
968 info->data_buff, info->data_buff_phys);968 info->data_buff, info->data_buff_phys);
@@ -1259,10 +1259,6 @@ static struct of_device_id pxa3xx_nand_dt_ids[] = { · 290 unmodified lines
1259 .compatible = "marvell,pxa3xx-nand",1259 .compatible = "marvell,pxa3xx-nand",
1260 .data = (void *)PXA3XX_NAND_VARIANT_PXA,1260 .data = (void *)PXA3XX_NAND_VARIANT_PXA,
1261 },1261 },
1262 {
1263 .compatible = "marvell,armada370-nand",
1264 .data = (void *)PXA3XX_NAND_VARIANT_ARMADA370,
1265 },
1266 {}1262 {}
1267};1263};
1268MODULE_DEVICE_TABLE(of, pxa3xx_nand_dt_ids);1264MODULE_DEVICE_TABLE(of, pxa3xx_nand_dt_ids);