projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'akpm' (patches from Andrew)
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpio
/
gpio-zynq.c
diff --git
a/drivers/gpio/gpio-zynq.c
b/drivers/gpio/gpio-zynq.c
index 2e87c4b8da26d5336164359a6a6e27f0a32de68c..a78882389836071510bbcd5548ce426e894868ab 100644
(file)
--- 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;
}