From f9c8e365e972bf7ec6dd690096acaa21372e9826 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 4 Feb 2013 21:41:13 +0000 Subject: intel_error_decode: Don't barf on a malformed PCI ID line Whoops, someone added UTS_RELEASE with no newline before PCI ID which upsets our naive parser. --- tools/intel_error_decode.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tools/intel_error_decode.c') diff --git a/tools/intel_error_decode.c b/tools/intel_error_decode.c index ca03c835..56bb9847 100644 --- a/tools/intel_error_decode.c +++ b/tools/intel_error_decode.c @@ -365,6 +365,11 @@ read_data_file (FILE *file) matched = sscanf (line, "PCI ID: 0x%04x\n", ®); if (matched == 0) matched = sscanf (line, " PCI ID: 0x%04x\n", ®); + if (matched == 0) { + const char *pci_id_start = strstr (line, "PCI ID"); + if (pci_id_start) + matched = sscanf (pci_id_start, "PCI ID: 0x%04x\n", ®); + } if (matched == 1) { devid = reg; printf("Detected GEN%i chipset\n", -- cgit v1.2.3