git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/qede/base: update FW to 8.40.25.0
[dpdk.git]
/
drivers
/
bus
/
vmbus
/
vmbus_common.c
diff --git
a/drivers/bus/vmbus/vmbus_common.c
b/drivers/bus/vmbus/vmbus_common.c
index
e3ceb69
..
48a219f
100644
(file)
--- a/
drivers/bus/vmbus/vmbus_common.c
+++ b/
drivers/bus/vmbus/vmbus_common.c
@@
-111,7
+111,6
@@
vmbus_probe_one_driver(struct rte_vmbus_driver *dr,
/* reference driver structure */
dev->driver = dr;
/* reference driver structure */
dev->driver = dr;
- dev->device.driver = &dr->driver;
if (dev->device.numa_node < 0) {
VMBUS_LOG(WARNING, " Invalid NUMA socket, default to 0");
if (dev->device.numa_node < 0) {
VMBUS_LOG(WARNING, " Invalid NUMA socket, default to 0");
@@
-124,6
+123,8
@@
vmbus_probe_one_driver(struct rte_vmbus_driver *dr,
if (ret) {
dev->driver = NULL;
rte_vmbus_unmap_device(dev);
if (ret) {
dev->driver = NULL;
rte_vmbus_unmap_device(dev);
+ } else {
+ dev->device.driver = &dr->driver;
}
return ret;
}
return ret;
@@
-142,7
+143,7
@@
vmbus_probe_all_drivers(struct rte_vmbus_device *dev)
int rc;
/* Check if a driver is already loaded */
int rc;
/* Check if a driver is already loaded */
- if (
dev->driver != NULL
) {
+ if (
rte_dev_is_probed(&dev->device)
) {
VMBUS_LOG(DEBUG, "VMBUS driver already loaded");
return 0;
}
VMBUS_LOG(DEBUG, "VMBUS driver already loaded");
return 0;
}