git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
drivers
/
pci
/
pci-stub.c
diff --git
a/drivers/pci/pci-stub.c
b/drivers/pci/pci-stub.c
index
f7b68ca
..
775e933
100644
(file)
--- a/
drivers/pci/pci-stub.c
+++ b/
drivers/pci/pci-stub.c
@@
-47,6
+47,10
@@
static int __init pci_stub_init(void)
if (rc)
return rc;
if (rc)
return rc;
+ /* no ids passed actually */
+ if (ids[0] == '\0')
+ return 0;
+
/* add ids specified in the module parameter */
p = ids;
while ((id = strsep(&p, ","))) {
/* add ids specified in the module parameter */
p = ids;
while ((id = strsep(&p, ","))) {
@@
-54,6
+58,9
@@
static int __init pci_stub_init(void)
subdevice = PCI_ANY_ID, class=0, class_mask=0;
int fields;
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);
fields = sscanf(id, "%x:%x:%x:%x:%x:%x",
&vendor, &device, &subvendor, &subdevice,
&class, &class_mask);