These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / media / dvb-frontends / drxk_hard.c

diff --git a/kernel/drivers/media/dvb-frontends/drxk_hard.c b/kernel/drivers/media/dvb-frontends/drxk_hard.c
index d46cf5f..b975da0 100644 (file)
--- a/kernel/drivers/media/dvb-frontends/drxk_hard.c
+++ b/kernel/drivers/media/dvb-frontends/drxk_hard.c
@@ -544,7 +544,7 @@ error:
 static int init_state(struct drxk_state *state)
 {
        /*
-        * FIXME: most (all?) of the values bellow should be moved into
+        * FIXME: most (all?) of the values below should be moved into
         * struct drxk_config, as they are probably board-specific
         */
        u32 ul_vsb_if_agc_mode = DRXK_AGC_CTRL_AUTO;
@@ -3262,6 +3262,7 @@ static int dvbt_sc_command(struct drxk_state *state,
        }
 
        /* Write needed parameters and the command */
+       status = 0;
        switch (cmd) {
                /* All commands using 5 parameters */
                /* All commands using 4 parameters */
@@ -3270,16 +3271,16 @@ static int dvbt_sc_command(struct drxk_state *state,
        case OFDM_SC_RA_RAM_CMD_PROC_START:
        case OFDM_SC_RA_RAM_CMD_SET_PREF_PARAM:
        case OFDM_SC_RA_RAM_CMD_PROGRAM_PARAM:
-               status = write16(state, OFDM_SC_RA_RAM_PARAM1__A, param1);
+               status |= write16(state, OFDM_SC_RA_RAM_PARAM1__A, param1);
                /* All commands using 1 parameters */
        case OFDM_SC_RA_RAM_CMD_SET_ECHO_TIMING:
        case OFDM_SC_RA_RAM_CMD_USER_IO:
-               status = write16(state, OFDM_SC_RA_RAM_PARAM0__A, param0);
+               status |= write16(state, OFDM_SC_RA_RAM_PARAM0__A, param0);
                /* All commands using 0 parameters */
        case OFDM_SC_RA_RAM_CMD_GET_OP_PARAM:
        case OFDM_SC_RA_RAM_CMD_NULL:
                /* Write command */
-               status = write16(state, OFDM_SC_RA_RAM_CMD__A, cmd);
+               status |= write16(state, OFDM_SC_RA_RAM_CMD__A, cmd);
                break;
        default:
                /* Unknown command */
@@ -6639,7 +6640,7 @@ error:
 }
 
 
-static int drxk_read_status(struct dvb_frontend *fe, fe_status_t *status)
+static int drxk_read_status(struct dvb_frontend *fe, enum fe_status *status)
 {
        struct drxk_state *state = fe->demodulator_priv;
        int rc;