diff mbox

[2/2] slimbus: qcom-ctrl: Fix devm_ioremap_resource() error handling

Message ID 20180109092644.wa4ubwxkcvc3lyza@mwanda (mailing list archive)
State New, archived
Headers show

Commit Message

Dan Carpenter Jan. 9, 2018, 9:26 a.m. UTC 
devm_ioremap_resource() returns error pointers, not NULL so the check
needs to be fixed.

Fixes: ad7fcbc308b0 ("slimbus: qcom: Add Qualcomm Slimbus controller driver")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Comments

Srinivas Kandagatla Jan. 9, 2018, 9:48 a.m. UTC | #1 
On 09/01/18 09:26, Dan Carpenter wrote:
> devm_ioremap_resource() returns error pointers, not NULL so the check
> needs to be fixed.
> 
> Fixes: ad7fcbc308b0 ("slimbus: qcom: Add Qualcomm Slimbus controller driver")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> diff --git a/drivers/slimbus/qcom-ctrl.c b/drivers/slimbus/qcom-ctrl.c
> index 3ab59209cbdc..6bf95bf33299 100644
> --- a/drivers/slimbus/qcom-ctrl.c
> +++ b/drivers/slimbus/qcom-ctrl.c
> @@ -528,9 +528,9 @@ static int qcom_slim_probe(struct platform_device *pdev)
>   
>   	slim_mem = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ctrl");
>   	ctrl->base = devm_ioremap_resource(ctrl->dev, slim_mem);
> -	if (!ctrl->base) {
> +	if (IS_ERR(ctrl->base)) {
>   		dev_err(&pdev->dev, "IOremap failed\n");
> -		return -ENOMEM;
> +		return PTR_ERR(ctrl->base);
>   	}
>   
>   	sctrl->set_laddr = qcom_set_laddr;
> 

Already fixed at:

https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg1575797.html
diff mbox

Patch

diff --git a/drivers/slimbus/qcom-ctrl.c b/drivers/slimbus/qcom-ctrl.c
index 3ab59209cbdc..6bf95bf33299 100644
--- a/drivers/slimbus/qcom-ctrl.c
+++ b/drivers/slimbus/qcom-ctrl.c
@@ -528,9 +528,9 @@  static int qcom_slim_probe(struct platform_device *pdev)
 
 	slim_mem = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ctrl");
 	ctrl->base = devm_ioremap_resource(ctrl->dev, slim_mem);
-	if (!ctrl->base) {
+	if (IS_ERR(ctrl->base)) {
 		dev_err(&pdev->dev, "IOremap failed\n");
-		return -ENOMEM;
+		return PTR_ERR(ctrl->base);
 	}
 
 	sctrl->set_laddr = qcom_set_laddr;