lkml.org 
[lkml]   [2016]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19.y-ckt 158/210] mtd: nand: denali: add missing nand_release() call in denali_remove()
    Date
    3.19.8-ckt14 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Boris BREZILLON <boris.brezillon@free-electrons.com>

    commit 320092a05dab2f44819c42f33d6b51efb6c474f2 upstream.

    Unregister the NAND device from the NAND subsystem when removing a denali
    NAND controller, otherwise the MTD attached to the NAND device is still
    exposed by the MTD layer, and accesses to this device will likely crash
    the system.

    Fixes: 2a0a288ec258 ("mtd: denali: split the generic driver and PCI layer")
    Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
    Acked-by: Dinh Nguyen <dinguyen@opensource.altera.com>
    Signed-off-by: Brian Norris <computersforpeace@gmail.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/mtd/nand/denali.c | 11 +++++++++--
    1 file changed, 9 insertions(+), 2 deletions(-)

    diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
    index b3b7ca1..e6c275d 100644
    --- a/drivers/mtd/nand/denali.c
    +++ b/drivers/mtd/nand/denali.c
    @@ -1651,9 +1651,16 @@ EXPORT_SYMBOL(denali_init);
    /* driver exit point */
    void denali_remove(struct denali_nand_info *denali)
    {
    + /*
    + * Pre-compute DMA buffer size to avoid any problems in case
    + * nand_release() ever changes in a way that mtd->writesize and
    + * mtd->oobsize are not reliable after this call.
    + */
    + int bufsize = denali->mtd.writesize + denali->mtd.oobsize;
    +
    + nand_release(&denali->mtd);
    denali_irq_cleanup(denali->irq, denali);
    - dma_unmap_single(denali->dev, denali->buf.dma_buf,
    - denali->mtd.writesize + denali->mtd.oobsize,
    + dma_unmap_single(denali->dev, denali->buf.dma_buf, bufsize,
    DMA_BIDIRECTIONAL);
    }
    EXPORT_SYMBOL(denali_remove);
    --
    1.9.1
    \
     
     \ /
      Last update: 2016-01-29 03:21    [W:4.043 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site