ARM: tegra: fix regulator_get() return value check
[linux-3.10.git] / arch / arm / mach-tegra / board-loki-panel.c
index 59361d7..a2ac263 100644 (file)
@@ -143,7 +143,7 @@ static int loki_hdmi_enable(struct device *dev)
        int ret;
        if (!loki_hdmi_reg) {
                loki_hdmi_reg = regulator_get(dev, "avdd_hdmi");
-               if (IS_ERR_OR_NULL(loki_hdmi_reg)) {
+               if (IS_ERR(loki_hdmi_reg)) {
                        pr_err("hdmi: couldn't get regulator avdd_hdmi\n");
                        loki_hdmi_reg = NULL;
                        return PTR_ERR(loki_hdmi_reg);
@@ -156,7 +156,7 @@ static int loki_hdmi_enable(struct device *dev)
        }
        if (!loki_hdmi_pll) {
                loki_hdmi_pll = regulator_get(dev, "avdd_hdmi_pll");
-               if (IS_ERR_OR_NULL(loki_hdmi_pll)) {
+               if (IS_ERR(loki_hdmi_pll)) {
                        pr_err("hdmi: couldn't get regulator avdd_hdmi_pll\n");
                        loki_hdmi_pll = NULL;
                        regulator_put(loki_hdmi_reg);
@@ -222,7 +222,7 @@ struct tmds_config loki_tmds_config[] = {
                .pll0 = 0x01003f10,
                .pll1 = 0x10300b00,
                .pe_current = 0x00000000,
-               .drive_current = 0x2e2e2e2e,
+               .drive_current = 0x32323232,
                .peak_current = 0x05050505,
        },
        { /* 1080p / 148.5MHz modes */
@@ -230,7 +230,7 @@ struct tmds_config loki_tmds_config[] = {
                .pll0 = 0x01003f10,
                .pll1 = 0x10300b00,
                .pe_current = 0x00000000,
-               .drive_current = 0x2e2e2e2e,
+               .drive_current = 0x32323232,
                .peak_current = 0x05050505,
        },
        { /* 297MHz modes */
@@ -238,7 +238,7 @@ struct tmds_config loki_tmds_config[] = {
                .pll0 = 0x01003f10,
                .pll1 = 0x13300b00,
                .pe_current = 0x00000000,
-               .drive_current = 0x34343434,
+               .drive_current = 0x36363636,
                .peak_current = 0x07070707,
        },
 };