[svn-commits] sruffell: linux/trunk r9496 - /linux/trunk/drivers/dahdi/dahdi-base.c

[SVN commits to the Digium repositories]

Author: sruffell
Date: Wed Nov 24 18:07:05 2010
New Revision: 9496

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9496
Log:
dahdi: dahdi_ioctl_iomux should return 0 on success.

This fixes a regression introduced in revision r9466.  Before this patch
one might see "I/O MUX failed: Success" messages on the Asterisk console
since the return from ioctl was > 0.

Signed-off-by: Sean Bright <sean.bright at gmail.com>
Acked-by: Shaun Ruffell <sruffell at digium.com>

Modified:
    linux/trunk/drivers/dahdi/dahdi-base.c

Modified: linux/trunk/drivers/dahdi/dahdi-base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/dahdi-base.c?view=diff&rev=9496&r1=9495&r2=9496
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi-base.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-base.c Wed Nov 24 18:07:05 2010
@@ -5029,6 +5029,7 @@
 		if (ret || (chan->iomask & DAHDI_IOMUX_NOWAIT)) {
 			/* set return value */
 			put_user(ret, (int __user *)data);
+			ret = 0;
 			break; /* get out of loop */
 		}