Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[firefly-linux-kernel-4.4.55.git] / drivers / media / dvb-frontends / drxd_hard.c

diff --git a/drivers/media/dvb-frontends/drxd_hard.c b/drivers/media/dvb-frontends/drxd_hard.c
index ae2276db77bc8ff448aeb50a4314e1723619b470..687e893d29fec6e0429e603832bc26eab3b2cbeb 100644 (file)
--- a/drivers/media/dvb-frontends/drxd_hard.c
+++ b/drivers/media/dvb-frontends/drxd_hard.c
@@ -2628,10 +2628,11 @@ static int DRXD_init(struct drxd_state *state, const u8 *fw, u32 fw_size)
                        break;
 
                /* Apply I2c address patch to B1 */
-               if (!state->type_A && state->m_HiI2cPatch != NULL)
+               if (!state->type_A && state->m_HiI2cPatch != NULL) {
                        status = WriteTable(state, state->m_HiI2cPatch);
                        if (status < 0)
                                break;
+               }
 
                if (state->type_A) {
                        /* HI firmware patch for UIO readout,
@@ -2830,14 +2831,8 @@ static int drxd_read_status(struct dvb_frontend *fe, fe_status_t * status)
 static int drxd_init(struct dvb_frontend *fe)
 {
        struct drxd_state *state = fe->demodulator_priv;
-       int err = 0;
 
-/*     if (request_firmware(&state->fw, "drxd.fw", state->dev)<0) */
        return DRXD_init(state, NULL, 0);
-
-       err = DRXD_init(state, state->fw->data, state->fw->size);
-       release_firmware(state->fw);
-       return err;
 }
 
 static int drxd_config_i2c(struct dvb_frontend *fe, int onoff)