Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71a8dffb authored by Andrew de Quincey's avatar Andrew de Quincey Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (3740): Fix oops in budget-av with CI 



Now that the CI code reinitialises the frontend, need to move the CI
initialisation to after the frontend init in order to ensure the frontend is
always in a good state. Fixes an oops caused by the frontend being NULL as
well.

Signed-off-by: default avatarAndrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 7a766f9d

drivers/media/dvb/ttpci/budget-av.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -1190,8 +1190,6 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio 
						SAA7146_HPS_SYNC_PORT_A);

						SAA7146_HPS_SYNC_PORT_A);





		saa7113_setinput(budget_av, 0);

		saa7113_setinput(budget_av, 0);

	} else {

		ciintf_init(budget_av);

	}

	}





	/* fixme: find some sane values here... */

	/* fixme: find some sane values here... */
@@ -1211,6 +1209,10 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio 
	budget_av->budget.dvb_adapter.priv = budget_av;

	budget_av->budget.dvb_adapter.priv = budget_av;

	frontend_init(budget_av);

	frontend_init(budget_av);





	if (!budget_av->has_saa7113) {

		ciintf_init(budget_av);

	}



	return 0;

	return 0;

}

}