From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y97Fv-0003D2-K8 for barebox@lists.infradead.org; Thu, 08 Jan 2015 07:11:44 +0000 Date: Thu, 8 Jan 2015 08:11:21 +0100 From: Sascha Hauer Message-ID: <20150108071121.GB18908@pengutronix.de> References: <20150106113227.GC4563@ns203013.ovh.net> <1420544226-30497-1-git-send-email-plagnioj@jcrosoft.com> <1420544226-30497-2-git-send-email-plagnioj@jcrosoft.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1420544226-30497-2-git-send-email-plagnioj@jcrosoft.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH 2/2] driver: workarroud resource request that conflist with errno PTR To: Jean-Christophe PLAGNIOL-VILLARD Cc: barebox@lists.infradead.org On Tue, Jan 06, 2015 at 12:37:06PM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote: > broken since > > commit ed6e965824303255cacc1c1a195d3684caa26bce > Author: Sascha Hauer > resource: Let dev_request_mem_region return an error pointer > > Introduce dev_request_mem_region_err_null > > only used on platform like at91 where the Ressource address collision with > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD > --- > arch/arm/mach-at91/at91sam926x_time.c | 6 +++--- > drivers/base/driver.c | 31 +++++++++++++++++++++++++++++-- > drivers/pinctrl/pinctrl-at91.c | 6 +++--- > drivers/serial/atmel.c | 6 +++--- > include/driver.h | 8 ++++++++ > 5 files changed, 46 insertions(+), 11 deletions(-) > > diff --git a/arch/arm/mach-at91/at91sam926x_time.c b/arch/arm/mach-at91/at91sam926x_time.c > index 789e1ec..cc7ad2f 100644 > --- a/arch/arm/mach-at91/at91sam926x_time.c > +++ b/arch/arm/mach-at91/at91sam926x_time.c > @@ -89,9 +89,9 @@ static int at91_pit_probe(struct device_d *dev) > return ret; > } > > - pit_base = dev_request_mem_region(dev, 0); > - if (IS_ERR(pit_base)) > - return PTR_ERR(pit_base); > + pit_base = dev_request_mem_region_err_null(dev, 0); > + if (!pit_base) > + return -ENOENT; > > pit_rate = clk_get_rate(clk) / 16; > > diff --git a/drivers/base/driver.c b/drivers/base/driver.c > index e0125a1..2375004 100644 > --- a/drivers/base/driver.c > +++ b/drivers/base/driver.c > @@ -242,8 +242,8 @@ int register_driver(struct driver_d *drv) > } > EXPORT_SYMBOL(register_driver); > > -struct resource *dev_get_resource(struct device_d *dev, unsigned long type, > - int num) > +static struct resource *__dev_get_resource(struct device_d *dev, > + unsigned long type, int num) > { > int i, n = 0; > > @@ -256,6 +256,17 @@ struct resource *dev_get_resource(struct device_d *dev, unsigned long type, > } > } > > + return NULL; > +} > + > +struct resource *dev_get_resource(struct device_d *dev, unsigned long type, > + int num) > +{ > + struct resource *res = __dev_get_resource(dev, type, num); > + > + if (res) > + return res; > + > return ERR_PTR(-ENOENT); > } > > @@ -318,6 +329,22 @@ void __iomem *dev_request_mem_region_by_name(struct device_d *dev, const char *n > } > EXPORT_SYMBOL(dev_request_mem_region_by_name); > > +void __iomem *dev_request_mem_region_err_null(struct device_d *dev, int num) > +{ > + struct resource *res; > + > + res = __dev_get_resource(dev, IORESOURCE_MEM, num); > + if (!res) > + return res; > + > + res = request_iomem_region(dev_name(dev), res->start, res->end); > + if (IS_ERR(res)) > + return ERR_CAST(res); The function promises to return NULL on error, so this is wrong here. I just sent an updated patch so that the release doesn't get delayed any more. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox