diff options
| author | Antoine Jacquet <royale@zerezo.com> | 2008-08-18 23:18:18 +0200 |
|---|---|---|
| committer | Antoine Jacquet <royale@zerezo.com> | 2008-08-18 23:18:18 +0200 |
| commit | e04f4692fb946b6480f856cb4986bacdc3a25f67 (patch) | |
| tree | 569253cfb9f1e2e656af7e27ccde5d1fd4361f81 /linux/drivers/media/dvb/frontends/dib7000p.c | |
| parent | 907cb68cd937317d682455610490e10b06389d22 (diff) | |
| parent | a499d8eb7179d0990c06b89c3362af960c7d9eef (diff) | |
| download | mediapointer-dvb-s2-e04f4692fb946b6480f856cb4986bacdc3a25f67.tar.gz mediapointer-dvb-s2-e04f4692fb946b6480f856cb4986bacdc3a25f67.tar.bz2 | |
merge: v4l-dvb
From: Antoine Jacquet <royale@zerezo.com>
Priority: normal
Signed-off-by: Antoine Jacquet <royale@zerezo.com>
Diffstat (limited to 'linux/drivers/media/dvb/frontends/dib7000p.c')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/dib7000p.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/frontends/dib7000p.c b/linux/drivers/media/dvb/frontends/dib7000p.c index c74d373b6..ebb7594e3 100644 --- a/linux/drivers/media/dvb/frontends/dib7000p.c +++ b/linux/drivers/media/dvb/frontends/dib7000p.c @@ -1359,7 +1359,8 @@ struct dvb_frontend * dib7000p_attach(struct i2c_adapter *i2c_adap, u8 i2c_addr, /* Ensure the output mode remains at the previous default if it's * not specifically set by the caller. */ - if (st->cfg.output_mode != OUTMODE_MPEG2_SERIAL) + if ((st->cfg.output_mode != OUTMODE_MPEG2_SERIAL) && + (st->cfg.output_mode != OUTMODE_MPEG2_PAR_GATED_CLK)) st->cfg.output_mode = OUTMODE_MPEG2_FIFO; demod = &st->demod; |