Message ID | 25ddf208-1f02-8bb7-b6b8-e0ffa422b754@users.sourceforge.net |
---|---|
State | New |
Headers | show |
Series | gpio-stmpe: Adjustments for two function implementations | expand |
On Fri, Jan 12, 2018 at 9:03 PM, SF Markus Elfring <elfring@users.sourceforge.net> wrote: > From: Markus Elfring <elfring@users.sourceforge.net> > Date: Fri, 12 Jan 2018 20:44:15 +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> Patch applied. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/gpio/gpio-stmpe.c b/drivers/gpio/gpio-stmpe.c index 2cf30dcba82a..d51e27eb1c59 100644 --- a/drivers/gpio/gpio-stmpe.c +++ b/drivers/gpio/gpio-stmpe.c @@ -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: "