From c700e3db0c855a2675b340e1ee1646678b19bcc6 Mon Sep 17 00:00:00 2001 From: Maksym Veremeyenko Date: Fri, 24 Nov 2017 09:02:26 +0100 Subject: [PATCH 4/4] Fix indention from last commit --- lib/libdvbv5/dvb-sat.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/libdvbv5/dvb-sat.c b/lib/libdvbv5/dvb-sat.c index 8b2fcf7d..8383cdf7 100644 --- a/lib/libdvbv5/dvb-sat.c +++ b/lib/libdvbv5/dvb-sat.c @@ -557,26 +557,26 @@ static int dvbsat_diseqc_set_input(struct dvb_v5_fe_parms_priv *parms, /* Negative numbers means to not use a DiSEqC switch */ if (parms->p.sat_number >= 0) { - if (!t) - rc = dvbsat_diseqc_write_to_port_group(parms, &cmd, high_band, - pol_v, sat_number); - else - rc = dvbsat_scr_odu_channel_change(parms, &cmd, high_band, - pol_v, sat_number, t); - - if (rc) { - dvb_logerr(_("sending diseq failed")); - return rc; - } - usleep((15 + parms->p.diseqc_wait) * 1000); - - /* miniDiSEqC/Toneburst commands are defined only for up to 2 sattelites */ - if (parms->p.sat_number < 2) { - rc = dvb_fe_diseqc_burst(&parms->p, parms->p.sat_number); - if (rc) + if (!t) + rc = dvbsat_diseqc_write_to_port_group(parms, &cmd, high_band, + pol_v, sat_number); + else + rc = dvbsat_scr_odu_channel_change(parms, &cmd, high_band, + pol_v, sat_number, t); + + if (rc) { + dvb_logerr(_("sending diseq failed")); return rc; - } - usleep(15 * 1000); + } + usleep((15 + parms->p.diseqc_wait) * 1000); + + /* miniDiSEqC/Toneburst commands are defined only for up to 2 sattelites */ + if (parms->p.sat_number < 2) { + rc = dvb_fe_diseqc_burst(&parms->p, parms->p.sat_number); + if (rc) + return rc; + } + usleep(15 * 1000); } rc = dvb_fe_sec_tone(&parms->p, tone_on ? SEC_TONE_ON : SEC_TONE_OFF); -- 2.13.6