2007-06-04 11:25:53 +00:00
|
|
|
Index: pcmcia-cs-3.2.8/cardmgr/cardmgr.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- pcmcia-cs-3.2.8.orig/cardmgr/cardmgr.c 2007-06-04 13:23:59.491689784 +0200
|
|
|
|
|
+++ pcmcia-cs-3.2.8/cardmgr/cardmgr.c 2007-06-04 13:24:00.561527144 +0200
|
2006-12-05 21:34:56 +00:00
|
|
|
@@ -739,10 +739,7 @@
|
|
|
|
|
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 @@
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
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 @@
|
|
|
|
|
|
|
|
|
|
/* 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 */
|
