[PATCH] usb: typec: ucsi: acpi: fix a NULL vs IS_ERR() check in probe

[PATCH] usb: typec: ucsi: acpi: fix a NULL vs IS_ERR() check in probe

[Dan Carpenter]

The devm_memremap() function never returns NULL.  It returns error
pointers.

Fixes: cdc3d2abf438 ("usb: typec: ucsi: acpi: Map the mailbox with memremap()")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 drivers/usb/typec/ucsi/ucsi_acpi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/typec/ucsi/ucsi_acpi.c b/drivers/usb/typec/ucsi/ucsi_acpi.c
index 7455e3aff2be..8873c1644a29 100644
--- a/drivers/usb/typec/ucsi/ucsi_acpi.c
+++ b/drivers/usb/typec/ucsi/ucsi_acpi.c
@@ -133,8 +133,8 @@ static int ucsi_acpi_probe(struct platform_device *pdev)
 	}
 
 	ua->base = devm_memremap(&pdev->dev, res->start, resource_size(res), MEMREMAP_WB);
-	if (!ua->base)
-		return -ENOMEM;
+	if (IS_ERR(ua->base))
+		return PTR_ERR(ua->base);
 
 	ret = guid_parse(UCSI_DSM_UUID, &ua->guid);
 	if (ret)
-- 
2.35.1

Re: [PATCH] usb: typec: ucsi: acpi: fix a NULL vs IS_ERR() check in probe

[Heikki Krogerus]

On Mon, May 09, 2022 at 12:08:28PM +0300, Dan Carpenter wrote:
> The devm_memremap() function never returns NULL.  It returns error
> pointers.

Oh, so memremap() and devm_memremap() don't behave the same way.
That's a bummer. Thanks for catching this.

Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>

> Fixes: cdc3d2abf438 ("usb: typec: ucsi: acpi: Map the mailbox with memremap()")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
>  drivers/usb/typec/ucsi/ucsi_acpi.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/usb/typec/ucsi/ucsi_acpi.c b/drivers/usb/typec/ucsi/ucsi_acpi.c
> index 7455e3aff2be..8873c1644a29 100644
> --- a/drivers/usb/typec/ucsi/ucsi_acpi.c
> +++ b/drivers/usb/typec/ucsi/ucsi_acpi.c
> @@ -133,8 +133,8 @@ static int ucsi_acpi_probe(struct platform_device *pdev)
>  	}
>  
>  	ua->base = devm_memremap(&pdev->dev, res->start, resource_size(res), MEMREMAP_WB);
> -	if (!ua->base)
> -		return -ENOMEM;
> +	if (IS_ERR(ua->base))
> +		return PTR_ERR(ua->base);
>  
>  	ret = guid_parse(UCSI_DSM_UUID, &ua->guid);
>  	if (ret)
> -- 
> 2.35.1

-- 
heikki

Re: [PATCH] usb: typec: ucsi: acpi: fix a NULL vs IS_ERR() check in probe

[Greg Kroah-Hartman]

On Mon, May 09, 2022 at 12:08:28PM +0300, Dan Carpenter wrote:
> The devm_memremap() function never returns NULL.  It returns error
> pointers.
> 
> Fixes: cdc3d2abf438 ("usb: typec: ucsi: acpi: Map the mailbox with memremap()")

As this is in Rafael's tree, he needs to take it, I can't:

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Re: [PATCH] usb: typec: ucsi: acpi: fix a NULL vs IS_ERR() check in probe

[Rafael J. Wysocki]

On 5/12/2022 11:36 AM, Greg Kroah-Hartman wrote:
> On Mon, May 09, 2022 at 12:08:28PM +0300, Dan Carpenter wrote:
>> The devm_memremap() function never returns NULL.  It returns error
>> pointers.
>>
>> Fixes: cdc3d2abf438 ("usb: typec: ucsi: acpi: Map the mailbox with memremap()")
> As this is in Rafael's tree, he needs to take it, I can't:
>
> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Applied now, thanks!

Fortunately, I've not pushed the original change before applying it.