Merge ../linux-2.6

1 files changed, 13 insertions, 0 deletions

diff --git a/drivers/media/dvb/frontends/cx24110.c b/drivers/media/dvb/frontends/cx24110.c
index d15d32c51dc5..f3edf8b517dd 100644
--- a/drivers/media/dvb/frontends/cx24110.c
+++ b/drivers/media/dvb/frontends/cx24110.c
@@ -371,6 +371,15 @@ static int cx24110_initfe(struct dvb_frontend* fe)
         return 0;
 }
 
+static int cx24110_sleep(struct dvb_frontend *fe)
+{
+        struct cx24110_state *state = fe->demodulator_priv;
+
+        if (state->config->pll_sleep)
+                  return state->config->pll_sleep(fe);
+        return 0;
+}
+
 static int cx24110_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltage)
 {
         struct cx24110_state *state = fe->demodulator_priv;
@@ -418,6 +427,9 @@ static int cx24110_send_diseqc_msg(struct dvb_frontend* fe,
         struct cx24110_state *state = fe->demodulator_priv;
         unsigned long timeout;
 
+        if (cmd->msg_len < 3 || cmd->msg_len > 6)
+                return -EINVAL;  /* not implemented */
+
         for (i = 0; i < cmd->msg_len; i++)
                 cx24110_writereg(state, 0x79 + i, cmd->msg[i]);
 
@@ -639,6 +651,7 @@ static struct dvb_frontend_ops cx24110_ops = {
         .release = cx24110_release,
 
         .init = cx24110_initfe,
+        .sleep = cx24110_sleep,
         .set_frontend = cx24110_set_frontend,
         .get_frontend = cx24110_get_frontend,
         .read_status = cx24110_read_status,