diff options
| author |  Ricardo Ribalda <ribalda@chromium.org>
| 2024-04-15 19:34:26 +0000 |
|---|---|---|
| committer |  Hans Verkuil <hverkuil-cisco@xs4all.nl>
| 2024-05-04 10:19:59 +0200 |
| commit | 2c7f7a3bfe2ab41d070913c2acde269e1ffeb3e2 (patch) | |
| tree | 17aebc3de30eca20c159b72a2ac105870c352b85 /drivers/media | |
| parent | media: intel/ipu6: Don't re-allocate memory for firmware (diff) | |
| download | linux-2c7f7a3bfe2ab41d070913c2acde269e1ffeb3e2.tar.gz linux-2c7f7a3bfe2ab41d070913c2acde269e1ffeb3e2.tar.bz2 linux-2c7f7a3bfe2ab41d070913c2acde269e1ffeb3e2.zip | |
media: v4l: async: refactor v4l2_async_create_ancillary_links
Return 0 without checking IS_ERR or PTR_ERR if CONFIG_MEDIA_CONTROLLER
is not enabled.
This makes cocci happier:
drivers/media/v4l2-core/v4l2-async.c:331:23-30: ERROR: PTR_ERR applied after initialization to constant on line 319
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/v4l2-core/v4l2-async.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c index 3a22da443a22..222f01665f7c 100644 --- a/drivers/media/v4l2-core/v4l2-async.c +++ b/drivers/media/v4l2-core/v4l2-async.c @@ -316,9 +316,8 @@ v4l2_async_nf_try_all_subdevs(struct v4l2_async_notifier *notifier); static int v4l2_async_create_ancillary_links(struct v4l2_async_notifier *n, struct v4l2_subdev *sd) { - struct media_link *link = NULL; - #if IS_ENABLED(CONFIG_MEDIA_CONTROLLER) + struct media_link *link; if (sd->entity.function != MEDIA_ENT_F_LENS && sd->entity.function != MEDIA_ENT_F_FLASH) @@ -326,9 +325,10 @@ static int v4l2_async_create_ancillary_links(struct v4l2_async_notifier *n, link = media_create_ancillary_link(&n->sd->entity, &sd->entity); -#endif - return IS_ERR(link) ? PTR_ERR(link) : 0; +#else + return 0; +#endif } static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier, |