Commit 8d5daf0d authored by Hans Verkuil's avatar Hans Verkuil Committed by sanglipeng
Browse files

media: pci: cx23885: replace BUG with error return 

stable inclusion
from stable-v5.10.197
commit 890d10e6b72fc7e51bcb261679e1117f3520ca97
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I96Q8P

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=890d10e6b72fc7e51bcb261679e1117f3520ca97



--------------------------------

[ Upstream commit 2e1796fd ]

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: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 567f94ec

drivers/media/pci/cx23885/cx23885-video.c

+1 −1
Original line number Diff line number Diff line
@@ -412,7 +412,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 0x%08x - dma=0x%08lx\n",

		buf, buf->vb.vb2_buf.index,