asheplyakov/propagator
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

probing.c: enhance usb_storage long wait

Browse Source 
It's pretty silly to wait for 10 seconds at once
while not having ensured that the module is being
loaded indeed...

Thanks rom_as@ for pointing this out.
This commit is contained in:
Michael Shigorin 2011-12-16 18:03:42 +02:00
parent 3b1a03f8b0
commit 8ed1a19660
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
probing.c
View File

@ -106,6 +106,11 @@ char * get_net_intf_description(char * intf_name)
#ifndef DISABLE_MEDIAS
static struct media_info * medias = NULL;
static int usb_not_there(void)
{
return opendir("/sys/module/usb_storage") == NULL;
}
static void find_media(void)
{
FILE *f;
@ -116,14 +121,19 @@ static void find_media(void)
char path[SYSFS_PATH_MAX];
char buf[512];
char *s;
int count = 0;
int i = 0, count = 0;
if (medias)
free(medias); /* that does not free the strings, by the way */
if ((dir = opendir("/sys/module/usb_storage")) != NULL) {
wait_message("Waiting for USB storage devices to show up.");
sleep(10);
log_message("checking for /sys/module/usb_storage directory");
if (usb_not_there()) {
wait_message("Waiting for USB storage devices to show up...");
my_insmod("usb_storage", NULL);
do {
sleep(1);
i++;
} while (usb_not_there() && (i < 10));
remove_wait_message();
}