This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/v4l-utils.git tree:
Subject: libdvbv5/dvb-fe: Fix return code Author: Mauro Carvalho Chehab <[email protected]> Date: Sun Aug 19 14:46:48 2012 -0300 Return 0 if no error; errorno otherwise. Signed-off-by: Mauro Carvalho Chehab <[email protected]> lib/libdvbv5/dvb-fe.c | 9 ++++----- utils/dvb/dvbv5-scan.c | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) --- http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=d9565212bba8ef99667149bd0bca82e5b6bb19f6 diff --git a/lib/libdvbv5/dvb-fe.c b/lib/libdvbv5/dvb-fe.c index eadabf6..046b73f 100644 --- a/lib/libdvbv5/dvb-fe.c +++ b/lib/libdvbv5/dvb-fe.c @@ -702,10 +702,9 @@ int dvb_fe_get_stats(struct dvb_v5_fe_parms *parms) if (ioctl(parms->fd, FE_READ_STATUS, &status) == -1) { dvb_perror("FE_READ_STATUS"); - valid = 0; - } else - valid = 1; - dvb_fe_store_stats(parms, DTV_STATUS, status, valid); + return EINVAL; + } + dvb_fe_store_stats(parms, DTV_STATUS, status, 1); if (ioctl(parms->fd, FE_READ_BER, &ber) == -1) valid = 0; @@ -741,7 +740,7 @@ int dvb_fe_get_stats(struct dvb_v5_fe_parms *parms) dvb_log("BER: %d, Strength: %d, SNR: %d, UCB: %d", ber, strength, snr, ucb); } - return status; + return 0; } diff --git a/utils/dvb/dvbv5-scan.c b/utils/dvb/dvbv5-scan.c index 937b9dd..3b19cdb 100644 --- a/utils/dvb/dvbv5-scan.c +++ b/utils/dvb/dvbv5-scan.c @@ -100,7 +100,7 @@ static int check_frontend(struct dvb_v5_fe_parms *parms, int timeout) for (i = 0; i < timeout * 10; i++) { rc = dvb_fe_get_stats(parms); - if (rc < 0) + if (rc) PERROR("dvb_fe_get_stats failed"); rc = dvb_fe_retrieve_stats(parms, DTV_STATUS, &status); _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
