release modules on error in init_driver()
free devices pointer in uninit_driver() git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22246 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -23,7 +23,7 @@
|
|||||||
#define copy_to_user memcpy
|
#define copy_to_user memcpy
|
||||||
#define CardServices gPcmciaCs->_CardServices
|
#define CardServices gPcmciaCs->_CardServices
|
||||||
|
|
||||||
const char sockname[] = "bus/pcmcia/sock/%d";
|
const char sockname[] = "bus/pcmcia/sock/%ld";
|
||||||
static char ** devices;
|
static char ** devices;
|
||||||
uint32 devices_count = 0;
|
uint32 devices_count = 0;
|
||||||
|
|
||||||
@@ -369,8 +369,11 @@ init_driver()
|
|||||||
devices_count++;
|
devices_count++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (devices_count <= 0)
|
if (devices_count <= 0) {
|
||||||
|
put_module(CS_CLIENT_MODULE_NAME);
|
||||||
|
put_module(DS_MODULE_NAME);
|
||||||
return ENODEV;
|
return ENODEV;
|
||||||
|
}
|
||||||
|
|
||||||
devices = malloc(sizeof(char *) * (devices_count+1));
|
devices = malloc(sizeof(char *) * (devices_count+1));
|
||||||
for (i=0; i<devices_count; i++) {
|
for (i=0; i<devices_count; i++) {
|
||||||
@@ -390,7 +393,9 @@ uninit_driver()
|
|||||||
for (i=0; i<devices_count; i++) {
|
for (i=0; i<devices_count; i++) {
|
||||||
free (devices[i]);
|
free (devices[i]);
|
||||||
}
|
}
|
||||||
|
free(devices);
|
||||||
|
|
||||||
put_module(DS_MODULE_NAME);
|
put_module(DS_MODULE_NAME);
|
||||||
put_module(CS_CLIENT_MODULE_NAME);
|
put_module(CS_CLIENT_MODULE_NAME);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user