diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2019-04-08 13:03:09 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2019-04-08 13:03:09 +0200 |
| commit | 26af34079f1d8299932303cfd2b376b9cf55a35c (patch) | |
| tree | f1a9824855fae569aa51c2109a5929715143093d /drivers/gpio/gpio-aspeed.c | |
| parent | gpio: mmio: Drop bgpio_dir_inverted (diff) | |
| parent | Linux 5.1-rc3 (diff) | |
| download | linux-26af34079f1d8299932303cfd2b376b9cf55a35c.tar.xz linux-26af34079f1d8299932303cfd2b376b9cf55a35c.zip | |
Merge tag 'v5.1-rc3' into devel
Linux 5.1-rc3
Diffstat (limited to 'drivers/gpio/gpio-aspeed.c')
| -rw-r--r-- | drivers/gpio/gpio-aspeed.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c index 44aa843fbada..0f1b55c7c361 100644 --- a/drivers/gpio/gpio-aspeed.c +++ b/drivers/gpio/gpio-aspeed.c @@ -1222,6 +1222,8 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev) gpio->offset_timer = devm_kzalloc(&pdev->dev, gpio->chip.ngpio, GFP_KERNEL); + if (!gpio->offset_timer) + return -ENOMEM; return aspeed_gpio_setup_irqs(gpio, pdev); } |