Merge remote-tracking branch 'pci/next'

[karo-tx-linux.git] / drivers / pci / pci-driver.c

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 108a3118ace7fbd107a2916aa29066cc326c0b6c..61122fa0879b0314f9802e49b337907e0a294d86 100644 (file)
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -172,7 +172,7 @@ static ssize_t store_remove_id(struct device_driver *driver, const char *buf,
        __u32 vendor, device, subvendor = PCI_ANY_ID,
                subdevice = PCI_ANY_ID, class = 0, class_mask = 0;
        int fields = 0;
        __u32 vendor, device, subvendor = PCI_ANY_ID,
                subdevice = PCI_ANY_ID, class = 0, class_mask = 0;
        int fields = 0;

-       int retval = -ENODEV;
+       size_t retval = -ENODEV;

 
        fields = sscanf(buf, "%x %x %x %x %x %x",
                        &vendor, &device, &subvendor, &subdevice,
 
        fields = sscanf(buf, "%x %x %x %x %x %x",
                        &vendor, &device, &subvendor, &subdevice,


@@ -190,15 +190,13 @@ static ssize_t store_remove_id(struct device_driver *driver, const char *buf,
                    !((id->class ^ class) & class_mask)) {
                        list_del(&dynid->node);
                        kfree(dynid);
                    !((id->class ^ class) & class_mask)) {
                        list_del(&dynid->node);
                        kfree(dynid);

-                       retval = 0;
+                       retval = count;

                        break;
                }
        }
        spin_unlock(&pdrv->dynids.lock);
 
                        break;
                }
        }
        spin_unlock(&pdrv->dynids.lock);
 

-       if (retval)
-               return retval;
-       return count;
+       return retval;

 }
 static DRIVER_ATTR(remove_id, S_IWUSR, NULL, store_remove_id);
 
 }
 static DRIVER_ATTR(remove_id, S_IWUSR, NULL, store_remove_id);