summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2014-05-23 14:50:09 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-05-23 14:50:09 +0300
commit2b22df835ba42ad6c5f09a52baf68cfb60650f56 (patch)
tree5ac4cb9dd5047da49e2dba10c9e07bc1b6fde11b /drivers/video
parent2dcfdc3066e51a2143ed99f2a17ba2f1f32d42b7 (diff)
downloadop-kernel-dev-2b22df835ba42ad6c5f09a52baf68cfb60650f56.zip
op-kernel-dev-2b22df835ba42ad6c5f09a52baf68cfb60650f56.tar.gz
OMAPDSS: HDMI: fix devm_ioremap_resource error checks
devm_ioremap_resource returns ERR_PTR on error, not NULL. Fix the error checks in the driver. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/omap2/dss/hdmi4_core.c4
-rw-r--r--drivers/video/fbdev/omap2/dss/hdmi5_core.c4
-rw-r--r--drivers/video/fbdev/omap2/dss/hdmi_phy.c4
-rw-r--r--drivers/video/fbdev/omap2/dss/hdmi_pll.c4
-rw-r--r--drivers/video/fbdev/omap2/dss/hdmi_wp.c4
5 files changed, 10 insertions, 10 deletions
diff --git a/drivers/video/fbdev/omap2/dss/hdmi4_core.c b/drivers/video/fbdev/omap2/dss/hdmi4_core.c
index 2678d6f..8bde7b7 100644
--- a/drivers/video/fbdev/omap2/dss/hdmi4_core.c
+++ b/drivers/video/fbdev/omap2/dss/hdmi4_core.c
@@ -1009,9 +1009,9 @@ int hdmi4_core_init(struct platform_device *pdev, struct hdmi_core_data *core)
}
core->base = devm_ioremap_resource(&pdev->dev, res);
- if (!core->base) {
+ if (IS_ERR(core->base)) {
DSSERR("can't ioremap CORE\n");
- return -ENOMEM;
+ return PTR_ERR(core->base);
}
return 0;
diff --git a/drivers/video/fbdev/omap2/dss/hdmi5_core.c b/drivers/video/fbdev/omap2/dss/hdmi5_core.c
index e390dd3..7528c7a 100644
--- a/drivers/video/fbdev/omap2/dss/hdmi5_core.c
+++ b/drivers/video/fbdev/omap2/dss/hdmi5_core.c
@@ -913,9 +913,9 @@ int hdmi5_core_init(struct platform_device *pdev, struct hdmi_core_data *core)
}
core->base = devm_ioremap_resource(&pdev->dev, res);
- if (!core->base) {
+ if (IS_ERR(core->base)) {
DSSERR("can't ioremap HDMI core\n");
- return -ENOMEM;
+ return PTR_ERR(core->base);
}
return 0;
diff --git a/drivers/video/fbdev/omap2/dss/hdmi_phy.c b/drivers/video/fbdev/omap2/dss/hdmi_phy.c
index 3970574..e007ac8 100644
--- a/drivers/video/fbdev/omap2/dss/hdmi_phy.c
+++ b/drivers/video/fbdev/omap2/dss/hdmi_phy.c
@@ -246,9 +246,9 @@ int hdmi_phy_init(struct platform_device *pdev, struct hdmi_phy_data *phy)
}
phy->base = devm_ioremap_resource(&pdev->dev, res);
- if (!phy->base) {
+ if (IS_ERR(phy->base)) {
DSSERR("can't ioremap TX PHY\n");
- return -ENOMEM;
+ return PTR_ERR(phy->base);
}
return 0;
diff --git a/drivers/video/fbdev/omap2/dss/hdmi_pll.c b/drivers/video/fbdev/omap2/dss/hdmi_pll.c
index 6b78d4f..54df12a 100644
--- a/drivers/video/fbdev/omap2/dss/hdmi_pll.c
+++ b/drivers/video/fbdev/omap2/dss/hdmi_pll.c
@@ -282,9 +282,9 @@ int hdmi_pll_init(struct platform_device *pdev, struct hdmi_pll_data *pll)
}
pll->base = devm_ioremap_resource(&pdev->dev, res);
- if (!pll->base) {
+ if (IS_ERR(pll->base)) {
DSSERR("can't ioremap PLLCTRL\n");
- return -ENOMEM;
+ return PTR_ERR(pll->base);
}
return 0;
diff --git a/drivers/video/fbdev/omap2/dss/hdmi_wp.c b/drivers/video/fbdev/omap2/dss/hdmi_wp.c
index 706ea90..496327e 100644
--- a/drivers/video/fbdev/omap2/dss/hdmi_wp.c
+++ b/drivers/video/fbdev/omap2/dss/hdmi_wp.c
@@ -249,9 +249,9 @@ int hdmi_wp_init(struct platform_device *pdev, struct hdmi_wp_data *wp)
}
wp->base = devm_ioremap_resource(&pdev->dev, res);
- if (!wp->base) {
+ if (IS_ERR(wp->base)) {
DSSERR("can't ioremap HDMI WP\n");
- return -ENOMEM;
+ return PTR_ERR(wp->base);
}
return 0;
OpenPOWER on IntegriCloud