]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
media: au0828: fix a NULL vs IS_ERR() check
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 14 May 2021 14:20:38 +0000 (16:20 +0200)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 13 Aug 2021 07:30:23 +0000 (09:30 +0200)
BugLink: https://bugs.launchpad.net/bugs/1938340
[ 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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/media/usb/au0828/au0828-core.c

index a8a72d5fbd129945a4ef005c05ce28108913567a..caefac07af927f0e62516ef1c4bda3bf6b3b0ce6 100644 (file)
@@ -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