Skip to content

Commit

Permalink
V4L/DVB (3740): Fix oops in budget-av with CI
Browse files Browse the repository at this point in the history
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: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Andrew de Quincey authored and Mauro Carvalho Chehab committed May 12, 2006
1 parent 7a766f9 commit 71a8dff
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/media/dvb/ttpci/budget-av.c
Original file line number Diff line number Diff line change
Expand Up @@ -1190,8 +1190,6 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio
SAA7146_HPS_SYNC_PORT_A);

saa7113_setinput(budget_av, 0);
} else {
ciintf_init(budget_av);
}

/* fixme: find some sane values here... */
Expand All @@ -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;
frontend_init(budget_av);

if (!budget_av->has_saa7113) {
ciintf_init(budget_av);
}

return 0;
}

Expand Down

0 comments on commit 71a8dff

Please sign in to comment.