diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
| commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
| tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /drivers/usb/serial/ezusb_convert.pl | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'drivers/usb/serial/ezusb_convert.pl')
| -rw-r--r-- | drivers/usb/serial/ezusb_convert.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/ezusb_convert.pl b/drivers/usb/serial/ezusb_convert.pl index 3c69e4c1c..13f114691 100644 --- a/drivers/usb/serial/ezusb_convert.pl +++ b/drivers/usb/serial/ezusb_convert.pl @@ -16,8 +16,8 @@ while (<STDIN>) { # ':' <len> <addr> <type> <len-data> <crc> '\r' # len, type, crc are 2-char hex, addr is 4-char hex. type is 00 for # normal records, 01 for EOF - my($lenstring, $addrstring, $typestring, $reststring) = - /^:(\w\w)(\w\w\w\w)(\w\w)(\w+)$/; + my($lenstring, $addrstring, $typestring, $reststring, $doscrap) = + /^:(\w\w)(\w\w\w\w)(\w\w)(\w+)(\r?)$/; die "malformed line: $_" unless $reststring; last if $typestring eq '01'; my($len) = hex($lenstring); |