FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Redhat > Fedora User

 
 
LinkBack Thread Tools
 
Old 12-02-2011, 08:40 AM
Martin Sivak
 
Default Pass the noprobe arguments to loadDriverFromMedia (#690058)

There was one codepath I overlooked.. this should solve it.
---
loader/driverdisk.c | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/loader/driverdisk.c b/loader/driverdisk.c
index 329c33e..707c253 100644
--- a/loader/driverdisk.c
+++ b/loader/driverdisk.c
@@ -676,7 +676,7 @@ int loadDriverFromMedia(int class, struct loaderData_s *loaderData,
/* Unload all devices and load them again to use the updated modules */
logMessage(INFO, "Trying to refresh loaded drivers");
mlRestoreModuleState(moduleState);
- if (!noprobe) detectHardware(USB_DETECT_DELAY);
+ detectHardware(USB_DETECT_DELAY);

/* Get info about modules after the update */
postDDstate = mlVersions();
@@ -744,7 +744,7 @@ int loadDriverDisks(int class, struct loaderData_s *loaderData, GTree *moduleSta
if (rc != 1)
return LOADER_OK;

- rc = loadDriverFromMedia(DEVICE_ANY, loaderData, 1, 0, moduleState);
+ rc = loadDriverFromMedia(DEVICE_ANY, loaderData, 1, FL_NOPROBE(flags), moduleState);
if (rc == LOADER_BACK)
return LOADER_OK;

@@ -753,7 +753,7 @@ int loadDriverDisks(int class, struct loaderData_s *loaderData, GTree *moduleSta
_("Do you wish to load any more driver disks?"));
if (rc != 1)
break;
- loadDriverFromMedia(DEVICE_ANY, loaderData, 0, 0, moduleState);
+ loadDriverFromMedia(DEVICE_ANY, loaderData, 0, FL_NOPROBE(flags), moduleState);
} while (1);

return LOADER_OK;
@@ -767,10 +767,12 @@ static void loadFromLocation(struct loaderData_s * loaderData, char * dir, GTree

loadDriverDisk(loaderData, dir);

- /* Unload all devices and load them again to use the updated modules */
- logMessage(INFO, "Trying to refresh loaded drivers");
- mlRestoreModuleState(moduleState);
- if (!FL_NOPROBE(flags)) detectHardware(USB_DETECT_DELAY);
+ if (!FL_NOPROBE(flags)) {
+ /* Unload all devices and load them again to use the updated modules */
+ logMessage(INFO, "Trying to refresh loaded drivers");
+ mlRestoreModuleState(moduleState);
+ detectHardware(USB_DETECT_DELAY);
+ }
}

void getDDFromSource(struct loaderData_s * loaderData, char * src, GTree *moduleState) {
--
1.7.4.4

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
 
Old 12-06-2011, 05:52 PM
"Brian C. Lane"
 
Default Pass the noprobe arguments to loadDriverFromMedia (#690058)

On Fri, Dec 02, 2011 at 10:40:42AM +0100, Martin Sivak wrote:
> There was one codepath I overlooked.. this should solve it.

Ack

--
Brian C. Lane | Anaconda Team | IRC: bcl #anaconda | Port Orchard, WA (PST8PDT)
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
 

Thread Tools




All times are GMT. The time now is 03:29 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org