summaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpio-zynq.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2015-08-13 14:42:55 +0200
committerLinus Walleij <linus.walleij@linaro.org>2015-08-13 14:42:55 +0200
commit5f6f02cd49d61e9856ff2c337578316a1a1b3f88 (patch)
treefd2e6961e8f609af41dd4a282008e1bc52cfa7c7 /drivers/gpio/gpio-zynq.c
parentgpio: brcmstb: support wakeup from S5 cold boot (diff)
parentLinux 4.2-rc4 (diff)
downloadlinux-5f6f02cd49d61e9856ff2c337578316a1a1b3f88.tar.xz
linux-5f6f02cd49d61e9856ff2c337578316a1a1b3f88.zip
Merge tag 'v4.2-rc4' into devel
Linux 4.2-rc4
Diffstat (limited to 'drivers/gpio/gpio-zynq.c')
-rw-r--r--drivers/gpio/gpio-zynq.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-zynq.c b/drivers/gpio/gpio-zynq.c
index bb3aacad4d3b..27348e7cb705 100644
--- a/drivers/gpio/gpio-zynq.c
+++ b/drivers/gpio/gpio-zynq.c
@@ -757,6 +757,7 @@ static int zynq_gpio_remove(struct platform_device *pdev)
gpiochip_remove(&gpio->chip);
clk_disable_unprepare(gpio->clk);
device_set_wakeup_capable(&pdev->dev, 0);
+ pm_runtime_disable(&pdev->dev);
return 0;
}