2 files changed, 5 insertions, 5 deletions

diff --git a/Documentation/pci.txt b/Documentation/pci.txt
index cdf2f3c0ab14..a8ded1a8bd62 100644
--- a/Documentation/pci.txt
+++ b/Documentation/pci.txt
@@ -163,9 +163,9 @@ echo "vendor device subvendor subdevice class class_mask driver_data" > \
 /sys/bus/pci/drivers/{driver}/new_id
 
 All fields are passed in as hexadecimal values (no leading 0x).
-Users need pass only as many fields as necessary:
-        o vendor, device, subvendor, and subdevice fields default
-          to PCI_ANY_ID (FFFFFFFF),
+The vendor and device fields are mandatory, the others are optional. Users
+need pass only as many optional fields as necessary:
+        o subvendor and subdevice fields default to PCI_ANY_ID (FFFFFFFF)
         o class and classmask fields default to 0
         o driver_data defaults to 0UL.
 
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 39e80fcef4b3..07fdb3cd6172 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -52,7 +52,7 @@ store_new_id(struct device_driver *driver, const char *buf, size_t count)
 {
         struct pci_dynid *dynid;
         struct pci_driver *pdrv = to_pci_driver(driver);
-        __u32 vendor=PCI_ANY_ID, device=PCI_ANY_ID, subvendor=PCI_ANY_ID,
+        __u32 vendor, device, subvendor=PCI_ANY_ID,
                 subdevice=PCI_ANY_ID, class=0, class_mask=0;
         unsigned long driver_data=0;
         int fields=0;
@@ -61,7 +61,7 @@ store_new_id(struct device_driver *driver, const char *buf, size_t count)
         fields = sscanf(buf, "%x %x %x %x %x %x %lux",
                         &vendor, &device, &subvendor, &subdevice,
                         &class, &class_mask, &driver_data);
-        if (fields < 0)
+        if (fields < 2)
                 return -EINVAL;
 
         dynid = kzalloc(sizeof(*dynid), GFP_KERNEL);