Ignore:
Timestamp:
Oct 25, 2006, 1:51:57 AM (13 years ago)
Author:
bruno
Message:

merge -r890:902 $SVN_M/branches/stable

Location:
trunk/mindi-busybox/modutils
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/mindi-busybox/modutils/lsmod.c

    r821 r904  
    9494
    9595    module_names = xmalloc(bufsize = 256);
    96     if (my_query_module(NULL, QM_MODULES, (void **)&module_names, &bufsize,
    97                 &nmod)) {
     96    if (my_query_module(NULL, QM_MODULES, &module_names, &bufsize, &nmod)) {
    9897        bb_perror_msg_and_die("QM_MODULES");
    9998    }
     
    112111            bb_perror_msg_and_die("module %s: QM_INFO", mn);
    113112        }
    114         if (my_query_module(mn, QM_REFS, (void **)&deps, &depsize, &count)) {
     113        if (my_query_module(mn, QM_REFS, &deps, &depsize, &count)) {
    115114            if (errno == ENOENT) {
    116115                /* The module was removed out from underneath us. */
  • trunk/mindi-busybox/modutils/modprobe.c

    r821 r904  
    689689            if (!show_only) {
    690690                int rc2 = wait4pid(bb_spawn(argv));
    691                
     691
    692692                if (do_insert) {
    693693                    rc = rc2; /* only last module matters */
     
    838838
    839839        // process tail ---> head
    840         rc = mod_process ( tail, 1 );
     840        if ((rc = mod_process ( tail, 1 )) != 0) {
     841            /*
     842             * In case of using udev, multiple instances of modprobe can be
     843             * spawned to load the same module (think of two same usb devices,
     844             * for example; or cold-plugging at boot time). Thus we shouldn't
     845             * fail if the module was loaded, and not by us.
     846             */
     847            if (already_loaded (mod) )
     848                rc = 0;
     849        }
    841850    }
    842851    else
Note: See TracChangeset for help on using the changeset viewer.