From 29b7f95f3bd244a4b4d036e1b3a94a7bfbe3581c Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 31 Jul 2014 09:02:47 +0200 Subject: resource: Let dev_get_mem_region return an error pointer Signed-off-by: Sascha Hauer Acked-by: Sebastian Hesselbarth --- drivers/net/orion-gbe.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'drivers/net/orion-gbe.c') diff --git a/drivers/net/orion-gbe.c b/drivers/net/orion-gbe.c index 991c8a80de..ab761ad2e0 100644 --- a/drivers/net/orion-gbe.c +++ b/drivers/net/orion-gbe.c @@ -415,6 +415,8 @@ static int port_probe(struct device_d *parent, struct port_priv *port) port->intf = PHY_INTERFACE_MODE_RGMII; port->regs = dev_get_mem_region(parent, 0) + PORTn_REGS(port->portno); + if (IS_ERR(port->regs)) + return PTR_ERR(port->regs); /* allocate rx/tx descriptors and buffers */ port->txdesc = dma_alloc_coherent(ALIGN(sizeof(*port->txdesc), 16)); @@ -490,6 +492,9 @@ static int orion_gbe_probe(struct device_d *dev) dev->priv = gbe; gbe->regs = dev_get_mem_region(dev, 0); + if (IS_ERR(gbe->regs)) + return PTR_ERR(gbe->regs); + gbe->clk = clk_get(dev, 0); if (!IS_ERR(gbe->clk)) clk_enable(gbe->clk); -- cgit v1.2.3