arm: tegra: power gate update
Bitan Biswas [Tue, 18 Sep 2012 16:09:31 +0000 (21:09 +0530)]
Tegra11x VENC partition unpowergate case had incorrect null string check.
Fixed this.

Reviewed-on: http://git-master/r/133581
(cherry picked from commit b9a9ed80bf069b5c1bc3de2f4277537ac20ece63)

Change-Id: I6fad16b078cb6805bc8849718b2c35fc0da78193
Signed-off-by: Bitan Biswas <bbiswas@nvidia.com>
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/143083
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>

Rebase-Id: Rf37e833a2f1f213c69b4c6eba52fdb6fad2bf20b

arch/arm/mach-tegra/powergate.c

index 4b0aeeb..215bc29 100644 (file)
@@ -21,6 +21,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/clk.h>
+#include <linux/string.h>
 #include <linux/debugfs.h>
 #include <linux/delay.h>
 #include <linux/err.h>
@@ -817,7 +818,7 @@ static bool tegra11x_pug_clk_n_rst_skip(int id, u32 idx)
 {
        switch (id) {
        case TEGRA_POWERGATE_VENC:
-               if ((!powergate_partition_info[id].clk_info[idx].clk_name) &&
+               if ((powergate_partition_info[id].clk_info[idx].clk_name) &&
                        (!(strncmp("csi",
                        powergate_partition_info[id].clk_info[idx].clk_name,
                        3)))) {
@@ -828,7 +829,7 @@ static bool tegra11x_pug_clk_n_rst_skip(int id, u32 idx)
                }
                break;
        case TEGRA_POWERGATE_DISA:
-               if ((!powergate_partition_info[id].clk_info[idx].clk_name) &&
+               if ((powergate_partition_info[id].clk_info[idx].clk_name) &&
                        (!(strncmp("csi",
                        powergate_partition_info[id].clk_info[idx].clk_name,
                        3)))) {