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

[cascardo/linux.git] / drivers / pinctrl / pinctrl-tb10x.c

diff --git a/drivers/pinctrl/pinctrl-tb10x.c b/drivers/pinctrl/pinctrl-tb10x.c
index 6474bbd..160a1f5 100644 (file)
--- a/drivers/pinctrl/pinctrl-tb10x.c
+++ b/drivers/pinctrl/pinctrl-tb10x.c
@@ -759,7 +759,7 @@ static struct pinctrl_desc tb10x_pindesc = {
 static int tb10x_pinctrl_probe(struct platform_device *pdev)
 {
        int ret = -EINVAL;
-       struct resource *mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       struct resource *mem;
        struct device *dev = &pdev->dev;
        struct device_node *of_node = dev->of_node;
        struct device_node *child;
@@ -771,11 +771,6 @@ static int tb10x_pinctrl_probe(struct platform_device *pdev)
                return -EINVAL;
        }
 
-       if (!mem) {
-               dev_err(dev, "No memory resource defined.\n");
-               return -EINVAL;
-       }
-
        state = devm_kzalloc(dev, sizeof(struct tb10x_pinctrl) +
                                        of_get_child_count(of_node)
                                        * sizeof(struct tb10x_of_pinfunc),
@@ -787,6 +782,7 @@ static int tb10x_pinctrl_probe(struct platform_device *pdev)
        state->pinfuncs = (struct tb10x_of_pinfunc *)(state + 1);
        mutex_init(&state->mutex);
 
+       mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        state->base = devm_ioremap_resource(dev, mem);
        if (IS_ERR(state->base)) {
                ret = PTR_ERR(state->base);