Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / net / ethernet / wiznet / w5100.c

diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c
index 13c5c9844da77bb2bfd2e288f221bdcb93357384..a495931a66a1f217216cdb90a6b6989881039f32 100644 (file)
--- a/drivers/net/ethernet/wiznet/w5100.c
+++ b/drivers/net/ethernet/wiznet/w5100.c
@@ -638,14 +638,12 @@ static int w5100_hw_probe(struct platform_device *pdev)
        }
 
        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!mem)
-               return -ENXIO;
-       mem_size = resource_size(mem);
-
        priv->base = devm_ioremap_resource(&pdev->dev, mem);
        if (IS_ERR(priv->base))
                return PTR_ERR(priv->base);
 
+       mem_size = resource_size(mem);
+
        spin_lock_init(&priv->reg_lock);
        priv->indirect = mem_size < W5100_BUS_DIRECT_SIZE;
        if (priv->indirect) {