ARM: tegra: fix regulator_get() return value check
[linux-3.10.git] / arch / arm / mach-tegra / panel-s-edp-wqxgap-15-6.c
index a15064c..be7df9c 100644 (file)
@@ -51,7 +51,7 @@ static int shield_edp_regulator_get(struct device *dev)
                return 0;
 
        vdd_ds_1v8 = regulator_get(dev, "vdd_lcd_1v8_s");
-       if (IS_ERR_OR_NULL(vdd_ds_1v8)) {
+       if (IS_ERR(vdd_ds_1v8)) {
                pr_err("vdd_ds_1v8 regulator get failed\n");
                err = PTR_ERR(vdd_ds_1v8);
                vdd_ds_1v8 = NULL;
@@ -59,7 +59,7 @@ static int shield_edp_regulator_get(struct device *dev)
        }
 
        vdd_lcd_bl_en = regulator_get(dev, "vdd_lcd_bl_en");
-       if (IS_ERR_OR_NULL(vdd_lcd_bl_en)) {
+       if (IS_ERR(vdd_lcd_bl_en)) {
                pr_err("vdd_lcd_bl_en regulator get failed\n");
                err = PTR_ERR(vdd_lcd_bl_en);
                vdd_lcd_bl_en = NULL;
@@ -67,7 +67,7 @@ static int shield_edp_regulator_get(struct device *dev)
        }
 
        avdd_lcd = regulator_get(dev, "avdd_lcd");
-       if (IS_ERR_OR_NULL(avdd_lcd)) {
+       if (IS_ERR(avdd_lcd)) {
                pr_err("avdd_lcd regulator get failed\n");
                err = PTR_ERR(avdd_lcd);
                avdd_lcd = NULL;
@@ -75,7 +75,7 @@ static int shield_edp_regulator_get(struct device *dev)
        }
 
        avdd_3v3_dp = regulator_get(dev, "avdd_3v3_dp");
-       if (IS_ERR_OR_NULL(avdd_3v3_dp)) {
+       if (IS_ERR(avdd_3v3_dp)) {
                pr_err("avdd_3v3_dp regulator get failed\n");
                err = PTR_ERR(avdd_3v3_dp);
                avdd_3v3_dp = NULL;