lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 154/348] media: au0828: fix a NULL vs IS_ERR() check
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit 8f2e452730d2bcd59fe05246f0e19a4c52e0012d ]

    The media_device_usb_allocate() function returns error pointers when
    it's enabled and something goes wrong. It can return NULL as well, but
    only if CONFIG_MEDIA_CONTROLLER is disabled so that doesn't apply here.

    Fixes: 812658d88d26 ("media: change au0828 to use Media Device Allocator API")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/usb/au0828/au0828-core.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/media/usb/au0828/au0828-core.c b/drivers/media/usb/au0828/au0828-core.c
    index a8a72d5fbd12..caefac07af92 100644
    --- a/drivers/media/usb/au0828/au0828-core.c
    +++ b/drivers/media/usb/au0828/au0828-core.c
    @@ -199,8 +199,8 @@ static int au0828_media_device_init(struct au0828_dev *dev,
    struct media_device *mdev;

    mdev = media_device_usb_allocate(udev, KBUILD_MODNAME, THIS_MODULE);
    - if (!mdev)
    - return -ENOMEM;
    + if (IS_ERR(mdev))
    + return PTR_ERR(mdev);

    dev->media_dev = mdev;
    #endif
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 08:23    [W:4.063 / U:0.432 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site