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

Commit 4b83a7a7 authored by Anton Nurkin's avatar Anton Nurkin Committed by Mauro Carvalho Chehab
Browse files

[media] cx23885: fix pointer to structure for CAM 



Fixes problem with CAM, when  after re-iinitialization
CAM used old pointer to structure.

Signed-off-by: default avatarAnton Nurkin <ptqa@netup.ru>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 0a23dc24

drivers/media/pci/cx23885/altera-ci.c

+3 −1
Original line number Diff line number Diff line
@@ -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);
@@ -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;
@@ -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) {