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

[linux-2.6-microblaze.git] / drivers / gpio / gpio-stp-xway.c

diff --git a/drivers/gpio/gpio-stp-xway.c b/drivers/gpio/gpio-stp-xway.c
index 6b9321e..202361e 100644 (file)
--- a/drivers/gpio/gpio-stp-xway.c
+++ b/drivers/gpio/gpio-stp-xway.c
@@ -199,21 +199,17 @@ static int xway_stp_hw_init(struct xway_stp *chip)
 
 static int xway_stp_probe(struct platform_device *pdev)
 {
-       struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       struct resource *res;
        const __be32 *shadow, *groups, *dsl, *phy;
        struct xway_stp *chip;
        struct clk *clk;
        int ret = 0;
 
-       if (!res) {
-               dev_err(&pdev->dev, "failed to request STP resource\n");
-               return -ENOENT;
-       }
-
        chip = devm_kzalloc(&pdev->dev, sizeof(*chip), GFP_KERNEL);
        if (!chip)
                return -ENOMEM;
 
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        chip->virt = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(chip->virt))
                return PTR_ERR(chip->virt);