FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleaner error handling in dahdi_register

Browse Source 
* Better error handling in dahdi_register.
* Fail registration if fails creating proc entry for span.

Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Acked-by: Shaun Ruffell <sruffell@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9626 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Tzafrir Cohen 2011-01-10 21:42:49 +00:00
parent 52cc07ecb1
commit adb849e064
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/dahdi/dahdi-base.c
View File

@ -6481,6 +6481,8 @@ static int span_sysfs_create(struct dahdi_span *span)
NULL, chan_name);
if (IS_ERR(dummy)) {
res = PTR_ERR(dummy);
chan_err(chan, "Failed creating sysfs device: %d\n",
res);
goto cleanup;
}
@ -6606,10 +6608,17 @@ static int _dahdi_register(struct dahdi_span *span, int prefmaster)
span->proc_entry = create_proc_read_entry(tempfile, 0444,
root_proc_entry, dahdi_proc_read,
(int *) (long) span->spanno);
if (!span->proc_entry) {
res = -EFAULT;
span_err(span, "Error creating procfs entry\n");
goto cleanup;
}
}
#endif
res = span_sysfs_create(span);
if (res)
goto cleanup;
if (debug & DEBUG_MAIN) {
module_printk(KERN_NOTICE, "Registered Span %d ('%s') with "
@ -6626,6 +6635,23 @@ static int _dahdi_register(struct dahdi_span *span, int prefmaster)
__dahdi_find_master_span();
return 0;
cleanup:
#ifdef CONFIG_PROC_FS
if (span->proc_entry) {
char tempfile[17];
snprintf(tempfile, sizeof(tempfile), "dahdi/%d", span->spanno);
remove_proc_entry(tempfile, NULL);
span->proc_entry = NULL;
}
#endif
for (x = 0; x < span->channels; x++) {
struct dahdi_chan *chan = span->chans[x];
if (test_bit(DAHDI_FLAGBIT_REGISTERED, &chan->flags))
dahdi_chan_unreg(chan);
}
return res;
}
/**