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: b8ec754ae4c5 ("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>

diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
index 6a7dcf43d71257cf3f9ac72b8856cd8131df44d1..2ff35d5d60f27ffddfe058bed6491bf6b8b8692f 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-async.c
+++ b/drivers/media/v4l2-core/v4l2-async.c
@@ -620,16 +620,10 @@ err_unlock:
 
 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);