summaryrefslogtreecommitdiff
path: root/drivers/media/pci/intel/ipu3/ipu3-cio2.c
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2023-07-05 23:29:55 +0200
committerMauro Carvalho Chehab <mchehab@kernel.org>2023-08-10 07:58:40 +0200
commit928d8e2fa642ba0b0e39e43b5ca877d9ca80b81e (patch)
tree00e1f10815224ff35b7f446a8dd77efa60bfc445 /drivers/media/pci/intel/ipu3/ipu3-cio2.c
parent41eebd643835700982ed5b028bf42f1ff2ead61f (diff)
media: ipu-bridge: Move initialization of node_names.vcm to ipu_bridge_init_swnode_names()
Move initialization of node_names.vcm to ipu_bridge_init_swnode_names() where it belongs. And make the initialization of nodes[SWNODE_VCM] unconditional, ipu_bridge_init_swnode_group() takes care of not registering it when there is no VCM. Reviewed-by: Andy Shevchenko <andy@kernel.org> Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'drivers/media/pci/intel/ipu3/ipu3-cio2.c')
-rw-r--r--drivers/media/pci/intel/ipu3/ipu3-cio2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.c b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
index 8df0304c991e..3cadf94256c0 100644
--- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c
+++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
@@ -1725,7 +1725,7 @@ static int cio2_pci_probe(struct pci_dev *pci_dev,
return -EINVAL;
}
- r = ipu_bridge_init(pci_dev);
+ r = ipu_bridge_init(dev);
if (r)
return r;
}