V4L/DVB (12206): get_dvb_firmware: Correct errors in MPC718 firmware extraction logic

The extraction routine for the MPC718 "firmware" had 2 bugs in it, where one
bug masked the effect of the other.  The loop iteration should have set
$prevlen = $currlen at the end of the loop, and the if() check should have used
&& instead of || for deciding if the firmware length is reasonable.

Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Andy Walls 2009-07-05 16:22:45 -03:00 committed by Mauro Carvalho Chehab
parent a5ca3a1bc7
commit 0a6843483c
1 changed files with 2 additions and 1 deletions

View File

@ -413,13 +413,14 @@ sub mpc718 {
while (<IN>) {
$currlen = length($_);
if ($prevlen == $currlen || $currlen <= 64) {
if ($prevlen == $currlen && $currlen <= 64) {
chop; chop; # Get rid of "TUNER GO"
s/^\0\0//; # get rid of leading 00 00 if it's there
printf OUT "$_";
$found = 1;
last;
}
$prevlen = $currlen;
}
}
close OUT;