diff options
| author | Tejun Heo <tj@kernel.org> | 2010-12-22 10:06:36 +0100 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-12-23 21:53:52 +0100 |
| commit | 99a0fadf561e1f553c08f0a29f8b2578f55dd5f0 (patch) | |
| tree | 97bf80533001e4aedf6e6e96e21c3cac4bd37641 | |
| parent | x86/PCI: irq and pci_ids patch for Intel Patsburg (diff) | |
| download | linux-99a0fadf561e1f553c08f0a29f8b2578f55dd5f0.tar.xz linux-99a0fadf561e1f553c08f0a29f8b2578f55dd5f0.zip | |
PCI: pci-stub: ignore zero-length id parameters
pci-stub uses strsep() to separate list of ids and generates a warning
message when it fails to parse an id. However, not specifying the
parameter results in ids set to an empty string. strsep() happily
returns the empty string as the first token and thus triggers the
warning message spuriously.
Make the tokner ignore zero length ids.
Reported-by: Chris Wright <chrisw@sous-sol.org>
Reported-by: Prasad Joshi <P.G.Joshi@student.reading.ac.uk>
Cc: stable@kernel.org
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
| -rw-r--r-- | drivers/pci/pci-stub.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pci/pci-stub.c b/drivers/pci/pci-stub.c index 4c0336b31caf..775e933c2225 100644 --- a/drivers/pci/pci-stub.c +++ b/drivers/pci/pci-stub.c @@ -58,6 +58,9 @@ static int __init pci_stub_init(void) subdevice = PCI_ANY_ID, class=0, class_mask=0; int fields; + if (!strlen(id)) + continue; + fields = sscanf(id, "%x:%x:%x:%x:%x:%x", &vendor, &device, &subvendor, &subdevice, &class, &class_mask); |