projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'pci-v4.4-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
pci
/
pci-driver.c
diff --git
a/drivers/pci/pci-driver.c
b/drivers/pci/pci-driver.c
index 306124bba61e2a1dbf3e116e33b8768db192bc25..4446fcb5effd347d87fb6314473297acc4558769 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;
-
in
t 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);