diff options
| author | Grant Likely <grant.likely@linaro.org> | 2014-11-24 15:50:07 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-11-24 15:50:07 +0100 |
| commit | 66e6a5a1fcd2f3e05f4d499b539a1f77ceb52d1d (patch) | |
| tree | d72f980f64b88ea4e976215a503fcb038e02f981 /drivers/media/dvb-frontends/ds3000.c | |
| parent | of: Properly set the OF_POPULATED_BUS flag on root node (diff) | |
| parent | Linux 3.18-rc6 (diff) | |
| download | linux-66e6a5a1fcd2f3e05f4d499b539a1f77ceb52d1d.tar.xz linux-66e6a5a1fcd2f3e05f4d499b539a1f77ceb52d1d.zip | |
Merge tag 'v3.18-rc6' into devicetree/next
v3.18-rc6 contains an important DT bug fix, c1a2086e2d, "of/selftest:
Fix off-by-one error in removal path" which affects testing of the
overlay patch series. Merge it into the devicetree/next staging branch
so that the overlay patches are applied on top of a known working tree.
Linux 3.18-rc6
Conflicts:
drivers/of/address.c
Diffstat (limited to 'drivers/media/dvb-frontends/ds3000.c')
| -rw-r--r-- | drivers/media/dvb-frontends/ds3000.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/media/dvb-frontends/ds3000.c b/drivers/media/dvb-frontends/ds3000.c index 335daeff91b9..9d0d0347758f 100644 --- a/drivers/media/dvb-frontends/ds3000.c +++ b/drivers/media/dvb-frontends/ds3000.c @@ -864,6 +864,13 @@ struct dvb_frontend *ds3000_attach(const struct ds3000_config *config, memcpy(&state->frontend.ops, &ds3000_ops, sizeof(struct dvb_frontend_ops)); state->frontend.demodulator_priv = state; + + /* + * Some devices like T480 starts with voltage on. Be sure + * to turn voltage off during init, as this can otherwise + * interfere with Unicable SCR systems. + */ + ds3000_set_voltage(&state->frontend, SEC_VOLTAGE_OFF); return &state->frontend; error3: |