Commit b1471c4f authored by Johannes Stezenbach's avatar Johannes Stezenbach Committed by Linus Torvalds
Browse files

[PATCH] dvb: dib3000: add NULL pointer check 



prevent NULL pointer related Oopses (Patrick Boettcher)

Signed-off-by: default avatarJohannes Stezenbach <js@linuxtv.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b8742700

drivers/media/dvb/frontends/dib3000mb.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static int dib3000mb_set_frontend(struct dvb_frontend* fe, 
	fe_code_rate_t fe_cr = FEC_NONE;

	int search_state, seq;



	if (tuner) {

	if (tuner && state->config.pll_addr && state->config.pll_set) {

		dib3000mb_tuner_pass_ctrl(fe,1,state->config.pll_addr(fe));

		state->config.pll_set(fe, fep, NULL);

		dib3000mb_tuner_pass_ctrl(fe,0,state->config.pll_addr(fe));

drivers/media/dvb/frontends/dib3000mc.c

+1 −1
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ static int dib3000mc_set_frontend(struct dvb_frontend* fe, 
	int search_state,auto_val;

	u16 val;



	if (tuner) { /* initial call from dvb */

	if (tuner && state->config.pll_addr && state->config.pll_set) { /* initial call from dvb */

		dib3000mc_tuner_pass_ctrl(fe,1,state->config.pll_addr(fe));

		state->config.pll_set(fe,fep,NULL);

		dib3000mc_tuner_pass_ctrl(fe,0,state->config.pll_addr(fe));

CRA Git | Maintained and supported by SUSTech CRA and CCSE