diff --git a/[refs] b/[refs]
index 5ba847fbf9c2..996246616755 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b444b36fee16d2aaae9cc91ce594ecb15d922a9
+refs/heads/master: 99a0fadf561e1f553c08f0a29f8b2578f55dd5f0
diff --git a/trunk/drivers/pci/pci-stub.c b/trunk/drivers/pci/pci-stub.c
index 4c0336b31caf..775e933c2225 100644
--- a/trunk/drivers/pci/pci-stub.c
+++ b/trunk/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);