diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2024-09-27 08:13:52 +0200 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2024-09-27 08:13:52 +0200 |
| commit | 3a39d672e7f48b8d6b91a09afa4b55352773b4b5 (patch) | |
| tree | f7ec4043b508f48430dd09ac338c38acf7d5a6cd /drivers/media/platform/microchip/microchip-isc-base.c | |
| parent | 151ac45348afc5b56baa584c7cd4876addf461ff (diff) | |
| parent | 62a0e2fa40c5c06742b8b4997ba5095a3ec28503 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts and no adjacent changes.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'drivers/media/platform/microchip/microchip-isc-base.c')
| -rw-r--r-- | drivers/media/platform/microchip/microchip-isc-base.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/drivers/media/platform/microchip/microchip-isc-base.c b/drivers/media/platform/microchip/microchip-isc-base.c index f3a5cbacadbe..28e56f6a695d 100644 --- a/drivers/media/platform/microchip/microchip-isc-base.c +++ b/drivers/media/platform/microchip/microchip-isc-base.c @@ -902,8 +902,11 @@ static int isc_set_fmt(struct isc_device *isc, struct v4l2_format *f) return 0; } -static int isc_validate(struct isc_device *isc) +static int isc_link_validate(struct media_link *link) { + struct video_device *vdev = + media_entity_to_video_device(link->sink->entity); + struct isc_device *isc = video_get_drvdata(vdev); int ret; int i; struct isc_format *sd_fmt = NULL; @@ -1906,20 +1909,6 @@ int microchip_isc_pipeline_init(struct isc_device *isc) } EXPORT_SYMBOL_GPL(microchip_isc_pipeline_init); -static int isc_link_validate(struct media_link *link) -{ - struct video_device *vdev = - media_entity_to_video_device(link->sink->entity); - struct isc_device *isc = video_get_drvdata(vdev); - int ret; - - ret = v4l2_subdev_link_validate(link); - if (ret) - return ret; - - return isc_validate(isc); -} - static const struct media_entity_operations isc_entity_operations = { .link_validate = isc_link_validate, }; |