# HG changeset patch # User Yoshiki Yazawa # Date 1264572770 -32400 # Node ID d74bcf2d255dc879ec4567921d660c2b39356f8f # Parent 59065b569eec4be224cb633da5b6abd71f3bd9a8 do not give up if LNB ioctl failed diff -r 59065b569eec -r d74bcf2d255d recpt1/recpt1.c --- a/recpt1/recpt1.c Wed Jan 27 14:36:47 2010 +0900 +++ b/recpt1/recpt1.c Wed Jan 27 15:12:50 2010 +0900 @@ -655,9 +655,7 @@ /* power on LNB */ if(tdata->table->type == CHTYPE_SATELLITE) { if(ioctl(tdata->tfd, LNB_ENABLE, tdata->lnb) < 0) { - close(tdata->tfd); fprintf(stderr, "Power on LNB failed: %s\n", device); - return 1; } } @@ -688,9 +686,7 @@ /* power on LNB */ if(tdata->table->type == CHTYPE_SATELLITE) { if(ioctl(tdata->tfd, LNB_ENABLE, tdata->lnb) < 0) { - close(tdata->tfd); - tdata->tfd = -1; - continue; + fprintf(stderr, "Warning: Power on LNB failed: %s\n", tuner[lp]); } } @@ -777,14 +773,16 @@ int close_tuner(thread_data *tdata) { + int rv = 0; + if(tdata->table->type == CHTYPE_SATELLITE) { if(ioctl(tdata->tfd, LNB_DISABLE, 0) < 0) { - return 1; + rv = 1; } } close(tdata->tfd); - return 0; + return rv; } int