]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: pci: cx23885: replace BUG with error return
authorHans Verkuil <hverkuil-cisco@xs4all.nl>
Fri, 21 Jul 2023 08:23:42 +0000 (10:23 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 23 Sep 2023 08:47:05 +0000 (10:47 +0200)
[ Upstream commit 2e1796fd4904fdd6062a8e4589778ea899ea0c8d ]

It was completely unnecessary to use BUG in buffer_prepare().
Just replace it with an error return. This also fixes a smatch warning:

drivers/media/pci/cx23885/cx23885-video.c:422 buffer_prepare() error: uninitialized symbol 'ret'.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/media/pci/cx23885/cx23885-video.c

index ecc580af01481d1cef7431aa201204af5f7fa00a..1c4b3224cb0fb64fbb0025295d74f7fc005515c8 100644 (file)
@@ -418,7 +418,7 @@ static int buffer_prepare(struct vb2_buffer *vb)
                                dev->height >> 1);
                break;
        default:
-               BUG();
+               return -EINVAL; /* should not happen */
        }
        dprintk(2, "[%p/%d] buffer_init - %dx%d %dbpp \"%s\" - dma=0x%08lx\n",
                buf, buf->vb.vb2_buf.index,