diff options
| author | Yeasah Pell <yeasah@schwide.net> | 2006-06-21 23:28:13 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-25 07:05:20 +0200 |
| commit | ceee526617a805eea908a59fced26635634c9035 (patch) | |
| tree | 3ca73e96a4862eda971fc532cc04390223e56126 /drivers/media/dvb/bt8xx/dst.c | |
| parent | V4L/DVB (4184): Static variables mustn't be EXPORT_SYMBOL 'ed (diff) | |
| download | linux-ceee526617a805eea908a59fced26635634c9035.tar.xz linux-ceee526617a805eea908a59fced26635634c9035.zip | |
V4L/DVB (4185): Conditionally enable 5 byte diseqc commands
Signed-off-by: Yeasah Pell <yeasah@schwide.net>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/bt8xx/dst.c')
| -rw-r--r-- | drivers/media/dvb/bt8xx/dst.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c index c538d272cf80..d687a14ec0a7 100644 --- a/drivers/media/dvb/bt8xx/dst.c +++ b/drivers/media/dvb/bt8xx/dst.c @@ -1466,9 +1466,12 @@ static int dst_set_diseqc(struct dvb_frontend *fe, struct dvb_diseqc_master_cmd if (state->dst_type != DST_TYPE_IS_SAT) return 0; - if (cmd->msg_len == 0 || cmd->msg_len > 4) + if (cmd->msg_len > 0 && cmd->msg_len < 5) + memcpy(&paket[3], cmd->msg, cmd->msg_len); + else if (cmd->msg_len == 5 && state->dst_hw_cap & DST_TYPE_HAS_DISEQC5) + memcpy(&paket[2], cmd->msg, cmd->msg_len); + else return -EINVAL; - memcpy(&paket[3], cmd->msg, cmd->msg_len); paket[7] = dst_check_sum(&paket[0], 7); dst_command(state, paket, 8); return 0; |