From e36b34aa8ce6de4e37dbfb020e7fe9d5ce068bb7 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Wed, 14 Dec 2011 19:02:48 +0000 Subject: dahdi: Return dahdi_span_ops.startup callback errors to userspace. Allows dahdi_cfg to return an error code if a board driver fails it's startup call for any reason. Signed-off-by: Shaun Ruffell Acked-by: Tzafrir Cohen git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10379 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/dahdi-base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 68ddfc8..453b782 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -4877,7 +4877,7 @@ static int dahdi_ioctl_startup(struct file *file, unsigned long data) __dahdi_find_master_span(); } put_span(s); - return 0; + return res; } static int dahdi_ioctl_shutdown(unsigned long data) -- cgit v1.2.3