From 99315ffcb06c924f4ef606248e7ede64d180ab04 Mon Sep 17 00:00:00 2001 From: Daniel Hellstrom Date: Tue, 27 Mar 2012 10:20:36 +0200 Subject: DRVMGR: insert_dev_into_bus depends on dev->drv, init earlier --- cpukit/libdrvmgr/drvmgr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cpukit/libdrvmgr/drvmgr.c b/cpukit/libdrvmgr/drvmgr.c index f83c37aa2f..161f3ad7b9 100644 --- a/cpukit/libdrvmgr/drvmgr.c +++ b/cpukit/libdrvmgr/drvmgr.c @@ -490,7 +490,7 @@ int drvmgr_dev_register(struct drvmgr_dev *dev) DBG("CUSTOM ASSOCIATION (%s to %s)\n", dev->name, drv->name); } else { /* Try to find a driver that can handle this device */ - drv = drvmgr_dev_find_drv(dev); + dev->drv = drv = drvmgr_dev_find_drv(dev); } DRVMGR_LOCK_WRITE(); @@ -501,7 +501,6 @@ int drvmgr_dev_register(struct drvmgr_dev *dev) if (bus) drvmgr_insert_dev_into_bus(bus, dev); - dev->drv = drv; if (!drv) { /* No driver found that can handle this device, put into * inactive list -- cgit v1.2.3