]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
gpio: stmpe: Move an assignment in stmpe_gpio_probe()
authorMarkus Elfring <elfring@users.sourceforge.net>
Fri, 12 Jan 2018 19:44:15 +0000 (20:44 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 17 Jan 2018 06:44:15 +0000 (07:44 +0100)
Move the assignment for the local variable "irq" so that its setting
will only be performed directly before it is checked by this function.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/gpio/gpio-stmpe.c

index b041c1768ecc28a3908d7b24614cca1c46cd7397..420892ccc31693db7e7cd76fb840078d7a7f9be6 100644 (file)
@@ -435,8 +435,6 @@ static int stmpe_gpio_probe(struct platform_device *pdev)
        int ret;
        int irq = 0;
 
-       irq = platform_get_irq(pdev, 0);
-
        stmpe_gpio = kzalloc(sizeof(*stmpe_gpio), GFP_KERNEL);
        if (!stmpe_gpio)
                return -ENOMEM;
@@ -459,6 +457,7 @@ static int stmpe_gpio_probe(struct platform_device *pdev)
        if (stmpe_gpio->norequest_mask)
                stmpe_gpio->chip.irq.need_valid_mask = true;
 
+       irq = platform_get_irq(pdev, 0);
        if (irq < 0)
                dev_info(&pdev->dev,
                        "device configured in no-irq mode: "