Skip to content

Commit fc2c204

Browse files
jwrdegoedemchehab
authored andcommitted
media: ipu3-cio2: Call cio2_bridge_init() before anything else
Since cio2_bridge_init() may now return -EPROBE_DEFER it is best to call it before anything else. Signed-off-by: Hans de Goede <[email protected]> Signed-off-by: Sakari Ailus <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
1 parent ae971cc commit fc2c204

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

drivers/media/pci/intel/ipu3/ipu3-cio2-main.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1713,11 +1713,6 @@ static int cio2_pci_probe(struct pci_dev *pci_dev,
17131713
struct cio2_device *cio2;
17141714
int r;
17151715

1716-
cio2 = devm_kzalloc(dev, sizeof(*cio2), GFP_KERNEL);
1717-
if (!cio2)
1718-
return -ENOMEM;
1719-
cio2->pci_dev = pci_dev;
1720-
17211716
/*
17221717
* On some platforms no connections to sensors are defined in firmware,
17231718
* if the device has no endpoints then we can try to build those as
@@ -1735,6 +1730,11 @@ static int cio2_pci_probe(struct pci_dev *pci_dev,
17351730
return r;
17361731
}
17371732

1733+
cio2 = devm_kzalloc(dev, sizeof(*cio2), GFP_KERNEL);
1734+
if (!cio2)
1735+
return -ENOMEM;
1736+
cio2->pci_dev = pci_dev;
1737+
17381738
r = pcim_enable_device(pci_dev);
17391739
if (r) {
17401740
dev_err(dev, "failed to enable device (%d)\n", r);

0 commit comments

Comments
 (0)