video: lcdc: 3228: update colorspace config

[firefly-linux-kernel-4.4.55.git] / drivers / amba / bus.c

diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
old mode 100644 (file)
new mode 100755 (executable)
index 4144a3a..0cde10e
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -284,7 +284,7 @@ static const struct dev_pm_ops amba_pm = {
        SET_RUNTIME_PM_OPS(
                amba_pm_runtime_suspend,
                amba_pm_runtime_resume,
-               pm_generic_runtime_idle
+               NULL
        )
 };
 
@@ -421,6 +421,7 @@ int amba_driver_register(struct amba_driver *drv)
 {
        drv->drv.bus = &amba_bustype;
 
+
 #define SETFN(fn)      if (drv->fn) drv->drv.fn = amba_##fn
        SETFN(probe);
        SETFN(remove);
@@ -490,6 +491,7 @@ int amba_device_add(struct amba_device *dev, struct resource *parent)
        }
 
        ret = amba_get_enable_pclk(dev);
+       ret = 0;
        if (ret == 0) {
                u32 pid, cid;