From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752565AbeCMJgJ (ORCPT ); Tue, 13 Mar 2018 05:36:09 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:39224 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752403AbeCMJgG (ORCPT ); Tue, 13 Mar 2018 05:36:06 -0400 X-Google-Smtp-Source: AG47ELulhdVWGPVvfvgAfYgTsnGFXu7D+w1s4NvxWrGV+0PLXNRGj/Bjwreg910dGMZjdu7rA1/7Dg== Subject: Re: [PATCH 3/3] drm/meson: Fix some error handling paths in 'meson_drv_bind_master()' To: Christophe JAILLET , airlied@linux.ie, carlo@caione.org, khilman@baylibre.com Cc: dri-devel@lists.freedesktop.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org References: From: Neil Armstrong Organization: Baylibre Message-ID: Date: Tue, 13 Mar 2018 10:36:03 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 12/03/2018 21:15, Christophe JAILLET wrote: > If one of these functions fail, we whould free 'drm', as alreadry done in > the other error handling paths, below and above. > > Fixes: bbbe775ec5b5 ("drm: Add support for Amlogic Meson Graphic Controller") > Signed-off-by: Christophe JAILLET > --- > drivers/gpu/drm/meson/meson_drv.c | 24 ++++++++++++++++-------- > 1 file changed, 16 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c > index 6ee3dd7fa450..3baceb744beb 100644 > --- a/drivers/gpu/drm/meson/meson_drv.c > +++ b/drivers/gpu/drm/meson/meson_drv.c > @@ -189,35 +189,43 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) > > res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "vpu"); > regs = devm_ioremap_resource(dev, res); > - if (IS_ERR(regs)) > - return PTR_ERR(regs); > + if (IS_ERR(regs)) { > + ret = PTR_ERR(regs); > + goto free_drm; > + } > > priv->io_base = regs; > > res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "hhi"); > /* Simply ioremap since it may be a shared register zone */ > regs = devm_ioremap(dev, res->start, resource_size(res)); > - if (!regs) > - return -EADDRNOTAVAIL; > + if (!regs) { > + ret = -EADDRNOTAVAIL; > + goto free_drm; > + } > > priv->hhi = devm_regmap_init_mmio(dev, regs, > &meson_regmap_config); > if (IS_ERR(priv->hhi)) { > dev_err(&pdev->dev, "Couldn't create the HHI regmap\n"); > - return PTR_ERR(priv->hhi); > + ret = PTR_ERR(priv->hhi); > + goto free_drm; > } > > res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dmc"); > /* Simply ioremap since it may be a shared register zone */ > regs = devm_ioremap(dev, res->start, resource_size(res)); > - if (!regs) > - return -EADDRNOTAVAIL; > + if (!regs) { > + ret = -EADDRNOTAVAIL; > + goto free_drm; > + } > > priv->dmc = devm_regmap_init_mmio(dev, regs, > &meson_regmap_config); > if (IS_ERR(priv->dmc)) { > dev_err(&pdev->dev, "Couldn't create the DMC regmap\n"); > - return PTR_ERR(priv->dmc); > + ret = PTR_ERR(priv->dmc); > + goto free_drm; > } > > priv->vsync_irq = platform_get_irq(pdev, 0); > Acked-by: Neil Armstrong Thanks, Neil