Skip to content

Commit

Permalink
[media] cx23885: fix pointer to structure for CAM
Browse files Browse the repository at this point in the history
Fixes problem with CAM, when  after re-iinitialization
CAM used old pointer to structure.

Signed-off-by: Anton Nurkin <ptqa@netup.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Anton Nurkin authored and Mauro Carvalho Chehab committed Sep 10, 2012
1 parent 0a23dc2 commit 4b83a7a
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/media/pci/cx23885/altera-ci.c
Original file line number Diff line number Diff line change
Expand Up @@ -724,6 +724,7 @@ int altera_ci_init(struct altera_ci_config *config, int ci_nr)
if (temp_int != NULL) {
inter = temp_int->internal;
(inter->cis_used)++;
inter->fpga_rw = config->fpga_rw;
ci_dbg_print("%s: Find Internal Structure!\n", __func__);
} else {
inter = kzalloc(sizeof(struct fpga_internal), GFP_KERNEL);
Expand All @@ -743,7 +744,6 @@ int altera_ci_init(struct altera_ci_config *config, int ci_nr)

ci_dbg_print("%s: setting state = %p for ci = %d\n", __func__,
state, ci_nr - 1);
inter->state[ci_nr - 1] = state;
state->internal = inter;
state->nr = ci_nr - 1;

Expand All @@ -765,6 +765,8 @@ int altera_ci_init(struct altera_ci_config *config, int ci_nr)
if (0 != ret)
goto err;

inter->state[ci_nr - 1] = state;

altera_hw_filt_init(config, ci_nr);

if (inter->strt_wrk) {
Expand Down

0 comments on commit 4b83a7a

Please sign in to comment.