Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+10 -10
+2 -2
drivers/video/fbdev/omap2/dss/hdmi4_core.c
··· 1009 1009 } 1010 1010 1011 1011 core->base = devm_ioremap_resource(&pdev->dev, res); 1012 - if (!core->base) { 1012 + if (IS_ERR(core->base)) { 1013 1013 DSSERR("can't ioremap CORE\n"); 1014 - return -ENOMEM; 1014 + return PTR_ERR(core->base); 1015 1015 } 1016 1016 1017 1017 return 0;
+2 -2
drivers/video/fbdev/omap2/dss/hdmi5_core.c
··· 913 913 } 914 914 915 915 core->base = devm_ioremap_resource(&pdev->dev, res); 916 - if (!core->base) { 916 + if (IS_ERR(core->base)) { 917 917 DSSERR("can't ioremap HDMI core\n"); 918 - return -ENOMEM; 918 + return PTR_ERR(core->base); 919 919 } 920 920 921 921 return 0;
+2 -2
drivers/video/fbdev/omap2/dss/hdmi_phy.c
··· 246 246 } 247 247 248 248 phy->base = devm_ioremap_resource(&pdev->dev, res); 249 - if (!phy->base) { 249 + if (IS_ERR(phy->base)) { 250 250 DSSERR("can't ioremap TX PHY\n"); 251 - return -ENOMEM; 251 + return PTR_ERR(phy->base); 252 252 } 253 253 254 254 return 0;
+2 -2
drivers/video/fbdev/omap2/dss/hdmi_pll.c
··· 282 282 } 283 283 284 284 pll->base = devm_ioremap_resource(&pdev->dev, res); 285 - if (!pll->base) { 285 + if (IS_ERR(pll->base)) { 286 286 DSSERR("can't ioremap PLLCTRL\n"); 287 - return -ENOMEM; 287 + return PTR_ERR(pll->base); 288 288 } 289 289 290 290 return 0;
+2 -2
drivers/video/fbdev/omap2/dss/hdmi_wp.c
··· 249 249 } 250 250 251 251 wp->base = devm_ioremap_resource(&pdev->dev, res); 252 - if (!wp->base) { 252 + if (IS_ERR(wp->base)) { 253 253 DSSERR("can't ioremap HDMI WP\n"); 254 - return -ENOMEM; 254 + return PTR_ERR(wp->base); 255 255 } 256 256 257 257 return 0;