ARM: tegra: fix regulator_get() return value check
[linux-3.10.git] / arch / arm / mach-tegra / panel-a-edp-1080p-14-0.c
index 62d8139..28932f1 100644 (file)
@@ -94,7 +94,7 @@ static int laguna_edp_regulator_get(struct device *dev)
                return 0;
 
        vdd_ds_1v8 = regulator_get(dev, "vdd_ds_1v8");
-       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;
@@ -102,7 +102,7 @@ static int laguna_edp_regulator_get(struct device *dev)
        }
 
        vdd_lcd_bl = regulator_get(dev, "vdd_lcd_bl");
-       if (IS_ERR_OR_NULL(vdd_lcd_bl)) {
+       if (IS_ERR(vdd_lcd_bl)) {
                pr_err("vdd_lcd_bl regulator get failed\n");
                err = PTR_ERR(vdd_lcd_bl);
                vdd_lcd_bl = NULL;
@@ -110,7 +110,7 @@ static int laguna_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;
@@ -118,7 +118,7 @@ static int laguna_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;