Merge tag 'v4.2-rc4' into devel

[karo-tx-linux.git] / drivers / gpio / gpio-zynq.c

diff --git a/drivers/gpio/gpio-zynq.c b/drivers/gpio/gpio-zynq.c
index bb3aacad4d3b3ffa24d5f6415b2acd97a4e70e2b..27348e7cb705909adafa01b4490b2866e125caae 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;
 }