mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-05 14:40:12 -04:00
media: v4l: async: Don't set notifier's V4L2 device if registering fails
The V4L2 device used to be set when the notifier was registered but this
has been moved to the notifier initialisation. Don't touch the V4L2 device
if registration fails.
Fixes: b8ec754ae4 ("media: v4l: async: Set v4l2_device and subdev in async notifier init")
Cc: <stable@vger.kernel.org> # for 6.6 and later
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
This commit is contained in:
committed by
Hans Verkuil
parent
6d8acd02c4
commit
46bc0234ad
@@ -620,16 +620,10 @@ static int __v4l2_async_nf_register(struct v4l2_async_notifier *notifier)
|
||||
|
||||
int v4l2_async_nf_register(struct v4l2_async_notifier *notifier)
|
||||
{
|
||||
int ret;
|
||||
|
||||
if (WARN_ON(!notifier->v4l2_dev == !notifier->sd))
|
||||
return -EINVAL;
|
||||
|
||||
ret = __v4l2_async_nf_register(notifier);
|
||||
if (ret)
|
||||
notifier->v4l2_dev = NULL;
|
||||
|
||||
return ret;
|
||||
return __v4l2_async_nf_register(notifier);
|
||||
}
|
||||
EXPORT_SYMBOL(v4l2_async_nf_register);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user