Hi wen,

wen yang <[email protected]> wrote on Tue, 5 Feb 2019
10:05:46 +0000:

> of_find_device_by_node() takes a reference to the struct device
> when it finds a match via get_device, there is no need to call
> get_device() twice.
> We also should make sure to drop the reference to the device
> taken by of_find_device_by_node() on driver unbind.
> 
> Fixes: 1d6b1e464950 ("mtd: mediatek: driver for MTK Smart Device")
> Signed-off-by: Wen Yang <[email protected]>
> Suggested-by: Boris Brezillon <[email protected]>
> Cc: Xiaolei Li <[email protected]>
> Cc: Boris Brezillon <[email protected]>
> Cc: Miquel Raynal <[email protected]>
> Cc: Richard Weinberger <[email protected]>
> Cc: David Woodhouse <[email protected]>
> Cc: Brian Norris <[email protected]>
> Cc: Marek Vasut <[email protected]>
> Cc: Matthias Brugger <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> ---
>  drivers/mtd/nand/raw/mtk_ecc.c | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/mtd/nand/raw/mtk_ecc.c b/drivers/mtd/nand/raw/mtk_ecc.c
> index 6432bd7..25bdc15 100644
> --- a/drivers/mtd/nand/raw/mtk_ecc.c
> +++ b/drivers/mtd/nand/raw/mtk_ecc.c
> @@ -265,17 +265,25 @@ static struct mtk_ecc *mtk_ecc_get(struct device_node 
> *np)
>  {
>       struct platform_device *pdev;
>       struct mtk_ecc *ecc;
> +     int ret;
>  
>       pdev = of_find_device_by_node(np);
> -     if (!pdev || !platform_get_drvdata(pdev))
> +     if (!pdev)
>               return ERR_PTR(-EPROBE_DEFER);
> +     if (!platform_get_drvdata(pdev)) {
> +             ret = -EPROBE_DEFER;
> +             goto err_put_device;
> +     }
>  
> -     get_device(&pdev->dev);
>       ecc = platform_get_drvdata(pdev);
>       clk_prepare_enable(ecc->clk);
>       mtk_ecc_hw_init(ecc);
>  
>       return ecc;
> +
> +err_put_device:
> +     put_device(&pdev->dev);
> +     return ERR_PTR(ret);

Same as before, I don't think a label is useful in this situation.


Thanks,
Miquèl

Reply via email to