[Pkg-voip-commits] r10088 - in /dahdi-linux/trunk/debian: changelog patches/fix_xpp_post_unregister patches/series

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Tue Jan 29 21:45:14 2013
New Revision: 10088

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10088
Log:
Patch fix_xpp_post_unregister: fixes a crash with manual
'dahdi_registration off'.

Added:
    dahdi-linux/trunk/debian/patches/fix_xpp_post_unregister
Modified:
    dahdi-linux/trunk/debian/changelog
    dahdi-linux/trunk/debian/patches/series

Modified: dahdi-linux/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/changelog?rev=10088&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/changelog (original)
+++ dahdi-linux/trunk/debian/changelog Tue Jan 29 21:45:14 2013
@@ -4,6 +4,8 @@
   * Remove non-free FPGA bitfiles and patch drivers to load them
     (Closes: #693666) (Ben Hutchings).
   * Patch fix_xpp_usermode: fixes odd xpp behaviour with later kernels.
+  * Patch fix_xpp_post_unregister: fixes a crash with manual
+    'dahdi_registration off'.
 
  -- Tzafrir Cohen <tzafrir at debian.org>  Mon, 28 Jan 2013 14:23:01 +0200
 

Added: dahdi-linux/trunk/debian/patches/fix_xpp_post_unregister
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/fix_xpp_post_unregister?rev=10088&op=file
==============================================================================
--- dahdi-linux/trunk/debian/patches/fix_xpp_post_unregister (added)
+++ dahdi-linux/trunk/debian/patches/fix_xpp_post_unregister Tue Jan 29 21:45:14 2013
@@ -1,0 +1,41 @@
+From: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Date: Thu, 15 Nov 2012 15:15:48 +0000
+Subject: xpp: pre/post_unregister: not for the EC
+Origin: http://git.asterisk.org/gitweb/?p=dahdi/linux.git;a=commit;h=c0eebd73bb29f1187b38cc3a41f1a86579e481ac
+
+Don't run the pre- and post-unregister hooks on a non-phone XPD
+(practically: the echo canceller). This fixes a panic with manual
+'dahdi_registertion off' as it is now called for the whole device
+(regression of 2.6.x).
+
+Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+
+---
+ drivers/dahdi/xpp/xpp_dahdi.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/dahdi/xpp/xpp_dahdi.c b/drivers/dahdi/xpp/xpp_dahdi.c
+index b9fa49a..b2f7008 100644
+--- a/drivers/dahdi/xpp/xpp_dahdi.c
++++ b/drivers/dahdi/xpp/xpp_dahdi.c
+@@ -1083,7 +1083,7 @@ int xpd_dahdi_postregister(xpd_t *xpd)
+  */
+ void xpd_dahdi_preunregister(xpd_t *xpd)
+ {
+-	if (!xpd)
++	if (!xpd || !IS_PHONEDEV(xpd))
+ 		return;
+ 	XPD_DBG(DEVICES, xpd, "\n");
+ 	update_xpd_status(xpd, DAHDI_ALARM_NOTOPEN);
+@@ -1103,7 +1103,7 @@ void xpd_dahdi_preunregister(xpd_t *xpd)
+ 
+ void xpd_dahdi_postunregister(xpd_t *xpd)
+ {
+-	if (!xpd)
++	if (!xpd || !IS_PHONEDEV(xpd))
+ 		return;
+ 	atomic_dec(&PHONEDEV(xpd).dahdi_registered);
+ 	atomic_dec(&num_registered_spans);
+-- 
+1.7.10.4
+

Modified: dahdi-linux/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/series?rev=10088&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/series (original)
+++ dahdi-linux/trunk/debian/patches/series Tue Jan 29 21:45:14 2013
@@ -7,3 +7,4 @@
 tor2-request_firmware
 pciradio-request_firmware
 fix_xpp_usermode
+fix_xpp_post_unregister