diff options
author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2014-08-26 06:23:07 -0400 |
---|---|---|
committer | Benjamin Gaignard <benjamin.gaignard@linaro.org> | 2014-08-26 08:16:39 -0400 |
commit | 88cfc3fb77d2a280f935dc482bdd781b96ff5570 (patch) | |
tree | 8704cc0a757cc98a6fdb746736adddbc7047101d | |
parent | 31f32a21aa7e31179406f82b5fb3195b83d7acc8 (diff) |
drm: sti: hdmi: fix return value check in sti_hdmi_probe()
In case of error, the function devm_ioremap_nocache() returns NULL
pointer not ERR_PTR(). The IS_ERR() test in the return value check
should be replaced with NULL test.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
-rw-r--r-- | drivers/gpu/drm/sti/sti_hdmi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c index 284e541d970d..8319f764c18e 100644 --- a/drivers/gpu/drm/sti/sti_hdmi.c +++ b/drivers/gpu/drm/sti/sti_hdmi.c | |||
@@ -713,8 +713,8 @@ static int sti_hdmi_probe(struct platform_device *pdev) | |||
713 | return -ENOMEM; | 713 | return -ENOMEM; |
714 | } | 714 | } |
715 | hdmi->regs = devm_ioremap_nocache(dev, res->start, resource_size(res)); | 715 | hdmi->regs = devm_ioremap_nocache(dev, res->start, resource_size(res)); |
716 | if (IS_ERR(hdmi->regs)) | 716 | if (!hdmi->regs) |
717 | return PTR_ERR(hdmi->regs); | 717 | return -ENOMEM; |
718 | 718 | ||
719 | if (of_device_is_compatible(np, "st,stih416-hdmi")) { | 719 | if (of_device_is_compatible(np, "st,stih416-hdmi")) { |
720 | res = platform_get_resource_byname(pdev, IORESOURCE_MEM, | 720 | res = platform_get_resource_byname(pdev, IORESOURCE_MEM, |
@@ -725,8 +725,8 @@ static int sti_hdmi_probe(struct platform_device *pdev) | |||
725 | } | 725 | } |
726 | hdmi->syscfg = devm_ioremap_nocache(dev, res->start, | 726 | hdmi->syscfg = devm_ioremap_nocache(dev, res->start, |
727 | resource_size(res)); | 727 | resource_size(res)); |
728 | if (IS_ERR(hdmi->syscfg)) | 728 | if (!hdmi->syscfg) |
729 | return PTR_ERR(hdmi->syscfg); | 729 | return -ENOMEM; |
730 | 730 | ||
731 | } | 731 | } |
732 | 732 | ||