mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-09-12 12:06:49 +03:00
08005bf6c9
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20475 3c298f89-4303-0410-b956-a3cf2f4a3e73
42 lines
1.1 KiB
Diff
42 lines
1.1 KiB
Diff
--- a/cardmgr/cardmgr.c
|
|
+++ b/cardmgr/cardmgr.c
|
|
@@ -739,10 +739,7 @@ static int try_insmod(char *mod, char *o
|
|
int ret;
|
|
|
|
strcpy(cmd, "insmod ");
|
|
- if (strchr(mod, '/') != NULL)
|
|
- sprintf(cmd+7, "%s/%s.o", modpath, mod);
|
|
- else
|
|
- sprintf(cmd+7, "%s/pcmcia/%s.o", modpath, mod);
|
|
+ sprintf(cmd+7, "%s/%s.o", modpath, mod);
|
|
if (access(cmd+7, R_OK) != 0) {
|
|
syslog(LOG_NOTICE, "module %s not available", cmd+7);
|
|
free(cmd);
|
|
@@ -808,11 +805,13 @@ static void install_module(char *mod, ch
|
|
}
|
|
|
|
if (do_modprobe) {
|
|
- if (try_modprobe(mod, opts) != 0)
|
|
+ if (try_modprobe(mod, opts) != 0) {
|
|
try_insmod(mod, opts);
|
|
+ }
|
|
} else {
|
|
- if (try_insmod(mod, opts) != 0)
|
|
+ if (try_insmod(mod, opts) != 0) {
|
|
try_modprobe(mod, opts);
|
|
+ }
|
|
}
|
|
}
|
|
|
|
@@ -1113,8 +1112,9 @@ static void do_remove(int sn)
|
|
|
|
/* remove kernel modules in inverse order */
|
|
for (i = 0; i < card->bindings; i++) {
|
|
- for (j = dev[i]->modules-1; j >= 0; j--)
|
|
+ for (j = dev[i]->modules-1; j >= 0; j--) {
|
|
remove_module(dev[i]->module[j]);
|
|
+ }
|
|
free_device(dev[i]);
|
|
}
|
|
/* Remove any MTD's bound to this socket */
|