diff mbox series

[v2] mtd: rawnand: omap2: Pass the parent of pdev to dma_request_chan()

Message ID 20181213192227.3815-1-boris.brezillon@bootlin.com
State Accepted
Delegated to: Miquel Raynal
Headers show
Series [v2] mtd: rawnand: omap2: Pass the parent of pdev to dma_request_chan() | expand

Commit Message

Boris Brezillon Dec. 13, 2018, 7:22 p.m. UTC
Commit e1e6255c311b ("mtd: rawnand: omap2: convert driver to
nand_scan()") moved part of the init code in the ->attach_chip hook
and at the same time changed the struct device object passed to
dma_request_chan() (&pdev->dev instead of pdev->dev.parent).

Fixes: e1e6255c311b ("mtd: rawnand: omap2: convert driver to nand_scan()")
Reported-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
---
Changes in v2:
- Fix the prefix
---
 drivers/mtd/nand/raw/omap2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Alexander Sverdlin Dec. 13, 2018, 7:51 p.m. UTC | #1
Hello Boris!

On Thu, 13 Dec 2018 20:22:27 +0100
Boris Brezillon <boris.brezillon@bootlin.com> wrote:

> Commit e1e6255c311b ("mtd: rawnand: omap2: convert driver to
> nand_scan()") moved part of the init code in the ->attach_chip hook
> and at the same time changed the struct device object passed to
> dma_request_chan() (&pdev->dev instead of pdev->dev.parent).
> 
> Fixes: e1e6255c311b ("mtd: rawnand: omap2: convert driver to nand_scan()")
> Reported-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>

Yes, it was it, thank you!
Tested-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>

> Cc: <stable@vger.kernel.org>
> Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
> ---
> Changes in v2:
> - Fix the prefix
> ---
>  drivers/mtd/nand/raw/omap2.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mtd/nand/raw/omap2.c b/drivers/mtd/nand/raw/omap2.c
> index 886d05c391ef..68e8b9f7f372 100644
> --- a/drivers/mtd/nand/raw/omap2.c
> +++ b/drivers/mtd/nand/raw/omap2.c
> @@ -1944,7 +1944,7 @@ static int omap_nand_attach_chip(struct nand_chip *chip)
>  	case NAND_OMAP_PREFETCH_DMA:
>  		dma_cap_zero(mask);
>  		dma_cap_set(DMA_SLAVE, mask);
> -		info->dma = dma_request_chan(dev, "rxtx");
> +		info->dma = dma_request_chan(dev->parent, "rxtx");
>  
>  		if (IS_ERR(info->dma)) {
>  			dev_err(dev, "DMA engine request failed\n");
> -- 
> 2.17.1
>
Miquel Raynal Dec. 15, 2018, 10:27 a.m. UTC | #2
Hi Boris,

Boris Brezillon <boris.brezillon@bootlin.com> wrote on Thu, 13 Dec 2018
20:22:27 +0100:

> Commit e1e6255c311b ("mtd: rawnand: omap2: convert driver to
> nand_scan()") moved part of the init code in the ->attach_chip hook
> and at the same time changed the struct device object passed to
> dma_request_chan() (&pdev->dev instead of pdev->dev.parent).
> 
> Fixes: e1e6255c311b ("mtd: rawnand: omap2: convert driver to nand_scan()")
> Reported-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
> ---

Applied on nand/next,

Thanks,
Miquèl
diff mbox series

Patch

diff --git a/drivers/mtd/nand/raw/omap2.c b/drivers/mtd/nand/raw/omap2.c
index 886d05c391ef..68e8b9f7f372 100644
--- a/drivers/mtd/nand/raw/omap2.c
+++ b/drivers/mtd/nand/raw/omap2.c
@@ -1944,7 +1944,7 @@  static int omap_nand_attach_chip(struct nand_chip *chip)
 	case NAND_OMAP_PREFETCH_DMA:
 		dma_cap_zero(mask);
 		dma_cap_set(DMA_SLAVE, mask);
-		info->dma = dma_request_chan(dev, "rxtx");
+		info->dma = dma_request_chan(dev->parent, "rxtx");
 
 		if (IS_ERR(info->dma)) {
 			dev_err(dev, "DMA engine request failed\n");