Commit fc2c2045 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

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: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent ae971cca

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

+5 −5
Original line number Diff line number Diff line
@@ -1713,11 +1713,6 @@ static int cio2_pci_probe(struct pci_dev *pci_dev, 
	struct cio2_device *cio2;

	int r;



	cio2 = devm_kzalloc(dev, sizeof(*cio2), GFP_KERNEL);

	if (!cio2)

		return -ENOMEM;

	cio2->pci_dev = pci_dev;



	/*

	 * On some platforms no connections to sensors are defined in firmware,

	 * 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, 
			return r;

	}



	cio2 = devm_kzalloc(dev, sizeof(*cio2), GFP_KERNEL);

	if (!cio2)

		return -ENOMEM;

	cio2->pci_dev = pci_dev;



	r = pcim_enable_device(pci_dev);

	if (r) {

		dev_err(dev, "failed to enable device (%d)\n", r);