diff options
| author | Sakari Ailus <sakari.ailus@linux.intel.com> | 2024-03-08 16:07:45 +0300 |
|---|---|---|
| committer | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2024-04-10 16:15:30 +0300 |
| commit | 46bc0234ad38063ce550ecf135c1a52458f0a804 (patch) | |
| tree | 93b88dd18a20fa3f14788e3f3263cceb9c6b7586 /drivers/media/v4l2-core | |
| parent | 6d8acd02c4c6a8f917eefac1de2e035521ca119d (diff) | |
| download | linux-46bc0234ad38063ce550ecf135c1a52458f0a804.tar.xz | |
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>
Diffstat (limited to 'drivers/media/v4l2-core')
| -rw-r--r-- | drivers/media/v4l2-core/v4l2-async.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c index 6a7dcf43d712..2ff35d5d60f2 100644 --- 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); |