APPLIED: [PATCH][SRU Bionic] firmware: arm_sdei: Fix return value check in sdei_present_dt()

Kleber Souza kleber.souza at canonical.com
Thu May 17 10:11:31 UTC 2018


On 05/02/18 23:27, dann frazier wrote:
> From: Wei Yongjun <weiyongjun1 at huawei.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1768663
> 
> In case of error, the function of_platform_device_create() returns
> NULL pointer not ERR_PTR(). The IS_ERR() test in the return value
> check should be replaced with NULL test.
> 
> Fixes: 677a60bd2003 ("firmware: arm_sdei: Discover SDEI support via ACPI")
> Acked-by: James Morse <james.morse at arm.com>
> Signed-off-by: Wei Yongjun <weiyongjun1 at huawei.com>
> Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
> (cherry picked from commit 2f7aacf795e0192648b51674aef90e755e02408c)
> Signed-off-by: dann frazier <dann.frazier at canonical.com>
> ---
>  drivers/firmware/arm_sdei.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c
> index 8f6563c595e5..1ea71640fdc2 100644
> --- a/drivers/firmware/arm_sdei.c
> +++ b/drivers/firmware/arm_sdei.c
> @@ -1023,7 +1023,7 @@ static bool __init sdei_present_dt(void)
>  
>  	pdev = of_platform_device_create(np, sdei_driver.driver.name, NULL);
>  	of_node_put(np);
> -	if (IS_ERR(pdev))
> +	if (!pdev)
>  		return false;
>  
>  	return true;
> 

Applied to bionic/master-next branch.

Thanks,
Kleber




More information about the kernel-team mailing list