patch-2.3.99-pre7 linux/drivers/usb/serial/ezusb_convert.pl

• Lines: 11
• Date: Fri May 5 13:41:30 2000
• Orig file: v2.3.99-pre6/linux/drivers/usb/serial/ezusb_convert.pl
• Orig date: Tue Apr 11 15:09:20 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/usb/serial/ezusb_convert.pl linux/drivers/usb/serial/ezusb_convert.pl
@@ -16,8 +16,8 @@
     # ':' <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);