[PATCH] ipmi: Fix ioremap error handling in bt-bmc

[PATCH] ipmi: Fix ioremap error handling in bt-bmc

[Joel Stanley]

devm_ioremap_resource returns ERR_PTR so we can't check for NULL.

Signed-off-by: Joel Stanley <joel@jms.id.au>
---
 drivers/char/ipmi/bt-bmc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/char/ipmi/bt-bmc.c b/drivers/char/ipmi/bt-bmc.c
index 2e880bf0be26..de64bf1f2f4d 100644
--- a/drivers/char/ipmi/bt-bmc.c
+++ b/drivers/char/ipmi/bt-bmc.c
@@ -438,8 +438,8 @@ static int bt_bmc_probe(struct platform_device *pdev)
 	}
 
 	bt_bmc->base = devm_ioremap_resource(&pdev->dev, res);
-	if (!bt_bmc->base)
-		return -ENOMEM;
+	if (IS_ERR(bt_bmc->base))
+		return PTR_ERR(bt_bmc->base);
 
 	mutex_init(&bt_bmc->mutex);
 	init_waitqueue_head(&bt_bmc->queue);
-- 
2.9.3

Re: [PATCH] ipmi: Fix ioremap error handling in bt-bmc

[Cédric Le Goater]

On 09/21/2016 12:05 PM, Joel Stanley wrote:
> devm_ioremap_resource returns ERR_PTR so we can't check for NULL.

Thanks for spotting this.

Acked-by: Cédric Le Goater <clg@kaod.org>

C. 

> Signed-off-by: Joel Stanley <joel@jms.id.au>
> ---
>  drivers/char/ipmi/bt-bmc.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/char/ipmi/bt-bmc.c b/drivers/char/ipmi/bt-bmc.c
> index 2e880bf0be26..de64bf1f2f4d 100644
> --- a/drivers/char/ipmi/bt-bmc.c
> +++ b/drivers/char/ipmi/bt-bmc.c
> @@ -438,8 +438,8 @@ static int bt_bmc_probe(struct platform_device *pdev)
>  	}
>  
>  	bt_bmc->base = devm_ioremap_resource(&pdev->dev, res);
> -	if (!bt_bmc->base)
> -		return -ENOMEM;
> +	if (IS_ERR(bt_bmc->base))
> +		return PTR_ERR(bt_bmc->base);
>  
>  	mutex_init(&bt_bmc->mutex);
>  	init_waitqueue_head(&bt_bmc->queue);
> 

Re: [PATCH] ipmi: Fix ioremap error handling in bt-bmc

[Corey Minyard]

On 09/21/2016 05:17 AM, Cédric Le Goater wrote:
> On 09/21/2016 12:05 PM, Joel Stanley wrote:
>> devm_ioremap_resource returns ERR_PTR so we can't check for NULL.
> Thanks for spotting this.
>
> Acked-by: Cédric Le Goater <clg@kaod.org>

Thanks, I've pull this into my tree.

-corey

> C.
>
>> Signed-off-by: Joel Stanley <joel@jms.id.au>
>> ---
>>   drivers/char/ipmi/bt-bmc.c | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/char/ipmi/bt-bmc.c b/drivers/char/ipmi/bt-bmc.c
>> index 2e880bf0be26..de64bf1f2f4d 100644
>> --- a/drivers/char/ipmi/bt-bmc.c
>> +++ b/drivers/char/ipmi/bt-bmc.c
>> @@ -438,8 +438,8 @@ static int bt_bmc_probe(struct platform_device *pdev)
>>   	}
>>   
>>   	bt_bmc->base = devm_ioremap_resource(&pdev->dev, res);
>> -	if (!bt_bmc->base)
>> -		return -ENOMEM;
>> +	if (IS_ERR(bt_bmc->base))
>> +		return PTR_ERR(bt_bmc->base);
>>   
>>   	mutex_init(&bt_bmc->mutex);
>>   	init_waitqueue_head(&bt_bmc->queue);
>>