diff options
| author | jmbills <42755197+jmbills@users.noreply.github.com> | 2019-10-25 19:18:34 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-25 19:18:34 +0300 |
| commit | ebac4ab4172ab7a776bb53e3f95b896ee3ff494b (patch) | |
| tree | 0df2ce67404dbca3ddc4ee063dbfd9ae455be682 | |
| parent | cc9cea46d74d280de03c713c8b555153fd811f09 (diff) | |
| parent | 0dbb60593ebb5a62190c0e6cff7f1770493303a2 (diff) | |
| download | openbmc-ebac4ab4172ab7a776bb53e3f95b896ee3ff494b.tar.xz | |
Merge pull request #18 from lprylli/intel2
gpio: aspeed: fix check for pointer return value
2 files changed, 25 insertions, 1 deletions
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0007-gpio-aspeed-fix-check-for-pointer-return-value.patch b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0007-gpio-aspeed-fix-check-for-pointer-return-value.patch new file mode 100644 index 000000000..ef225bbf3 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed/0007-gpio-aspeed-fix-check-for-pointer-return-value.patch @@ -0,0 +1,24 @@ +From f15444796465b2d1514933c20a44417f4a09a2fd Mon Sep 17 00:00:00 2001 +From: Loic Prylli <lprylli@netflix.com> +Date: Thu, 12 Sep 2019 14:16:07 -0700 +Subject: [PATCH] gpio: aspeed: fix check for pointer return value + +If dts does not have a pinctrl passthrough property, +the kernel would oops or misbehave before the fix. +--- + drivers/gpio/gpio-aspeed.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c +index d4aaf7fa8e4b..26f487296365 100644 +--- a/drivers/gpio/gpio-aspeed.c ++++ b/drivers/gpio/gpio-aspeed.c +@@ -1205,7 +1205,7 @@ static int __init aspeed_gpio_probe(struct platform_device *pdev) + * of the GPIO pins, so they can be requested at runtime. + */ + pinctrl = pinctrl_get_select(&pdev->dev, "pass-through"); +- if (pinctrl) ++ if (!IS_ERR(pinctrl)) + pinctrl_put(pinctrl); + + /* diff --git a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed_%.bbappend index 9cb4b4eb3..18844957a 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-openbmc-mods/meta-ast2500/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -1,2 +1,2 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/linux-aspeed:" -SRC_URI += "file://intel-ast2500.cfg"
\ No newline at end of file +SRC_URI += "file://intel-ast2500.cfg" |