lkml.org 
[lkml]   [2020]   [Aug]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.8 31/72] platform/x86: intel-vbtn: Fix return value check in check_acpi_dev()
    Date
    From: Lu Wei <luwei32@huawei.com>

    [ Upstream commit 64dd4a5a7d214a07e3d9f40227ec30ac8ba8796e ]

    In the function check_acpi_dev(), if it fails to create
    platform device, the return value is ERR_PTR() or NULL.
    Thus it must use IS_ERR_OR_NULL() to check return value.

    Fixes: 332e081225fc ("intel-vbtn: new driver for Intel Virtual Button")
    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Lu Wei <luwei32@huawei.com>
    Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/platform/x86/intel-vbtn.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/platform/x86/intel-vbtn.c b/drivers/platform/x86/intel-vbtn.c
    index 0487b606a2749..e85d8e58320c1 100644
    --- a/drivers/platform/x86/intel-vbtn.c
    +++ b/drivers/platform/x86/intel-vbtn.c
    @@ -299,7 +299,7 @@ check_acpi_dev(acpi_handle handle, u32 lvl, void *context, void **rv)
    return AE_OK;

    if (acpi_match_device_ids(dev, ids) == 0)
    - if (acpi_create_platform_device(dev, NULL))
    + if (!IS_ERR_OR_NULL(acpi_create_platform_device(dev, NULL)))
    dev_info(&dev->dev,
    "intel-vbtn: created platform device\n");

    --
    2.25.1
    \
     
     \ /
      Last update: 2020-08-09 01:36    [W:4.127 / U:0.220 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site