Skip to contentSkip to conversation

Wrong code on init failure

PATCH In review Pascal Terjan 1 participant 2 messages May 12, 2010 Media (V4L/DVB)

lore
Share & tools
lore

Pascal Terjan

author
#0 lore raw

PATCH 1/1 Wrong code on init failure

In frontend_init you can read:

    if (budget->dvb_frontend) {
        ctl = dvb_attach(stv6110x_attach,
                         budget->dvb_frontend,
                         &tt1600_stv6110x_config,
                         &budget->i2c_adap);
        tt1600_stv090x_config.tuner_init          = ctl->tuner_init;

[...]

    } else {
        dvb_frontend_detach(budget->dvb_frontend);
        budget->dvb_frontend = NULL;
    }

But if we are in else, budget->dvb_frontend is already NULL...

I guess the else part could better apply to a test on ctl before using it

---
 drivers/media/dvb/ttpci/budget.c |   39 +++++++++++++++++++------------------
 1 files changed, 20 insertions(+), 19 deletions(-)
drivers/media/dvb/ttpci/budget.c +20 -19
index 9fdf26c..14adf27 100644
@@ -627,25 +627,26 @@ static void frontend_init(struct budget *budget)
 						 &tt1600_stv6110x_config,
 						 &budget->i2c_adap);
 
-				tt1600_stv090x_config.tuner_init	  = ctl->tuner_init;
-				tt1600_stv090x_config.tuner_set_mode	  = ctl->tuner_set_mode;
-				tt1600_stv090x_config.tuner_set_frequency = ctl->tuner_set_frequency;
-				tt1600_stv090x_config.tuner_get_frequency = ctl->tuner_get_frequency;
-				tt1600_stv090x_config.tuner_set_bandwidth = ctl->tuner_set_bandwidth;
-				tt1600_stv090x_config.tuner_get_bandwidth = ctl->tuner_get_bandwidth;
-				tt1600_stv090x_config.tuner_set_bbgain	  = ctl->tuner_set_bbgain;
-				tt1600_stv090x_config.tuner_get_bbgain	  = ctl->tuner_get_bbgain;
-				tt1600_stv090x_config.tuner_set_refclk	  = ctl->tuner_set_refclk;
-				tt1600_stv090x_config.tuner_get_status	  = ctl->tuner_get_status;
-
-				dvb_attach(isl6423_attach,
-					budget->dvb_frontend,
-					&budget->i2c_adap,
-					&tt1600_isl6423_config);
-
-			} else {
-				dvb_frontend_detach(budget->dvb_frontend);
-				budget->dvb_frontend = NULL;
+				if (ctl) {
+					tt1600_stv090x_config.tuner_init	  = ctl->tuner_init;
+					tt1600_stv090x_config.tuner_set_mode	  = ctl->tuner_set_mode;
+					tt1600_stv090x_config.tuner_set_frequency = ctl->tuner_set_frequency;
+					tt1600_stv090x_config.tuner_get_frequency = ctl->tuner_get_frequency;
+					tt1600_stv090x_config.tuner_set_bandwidth = ctl->tuner_set_bandwidth;
+					tt1600_stv090x_config.tuner_get_bandwidth = ctl->tuner_get_bandwidth;
+					tt1600_stv090x_config.tuner_set_bbgain	  = ctl->tuner_set_bbgain;
+					tt1600_stv090x_config.tuner_get_bbgain	  = ctl->tuner_get_bbgain;
+					tt1600_stv090x_config.tuner_set_refclk	  = ctl->tuner_set_refclk;
+					tt1600_stv090x_config.tuner_get_status	  = ctl->tuner_get_status;
+
+					dvb_attach(isl6423_attach,
+						budget->dvb_frontend,
+						&budget->i2c_adap,
+						&tt1600_isl6423_config);
+				} else {
+					dvb_frontend_detach(budget->dvb_frontend);
+					budget->dvb_frontend = NULL;
+				}
 			}
 		}
 		break;
Signature · 1 line
1.7.1