From 4620300643e819b1bfff9d10a42e985e5e38ece5 Mon Sep 17 00:00:00 2001 From: Tzafrir Cohen Date: Thu, 5 Jan 2012 17:34:16 +0000 Subject: xpp: Don't deactivate XPDs on unregistration * A bug was introduced during migration to dahdi_device code: http://svnview.digium.com/svn/dahdi?view=rev&rev=10273 * Marking XPDs as non-functional (card_present=0, XPD_STATE_NOHW) was moved from xbus_request_removal() into xpd_dahdi_preunregister() * As a result, unregistering an Astribank, made it non-functional so trying to re-register it later caused errors (e.g: "Cannot open" error message from xpp_open()) * This fix move XPD deactivation into the proper location (during xbus_deactivate() Signed-off-by: Oron Peled Acked-By: Tzafrir Cohen git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10409 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/xpp/xpp_dahdi.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'drivers/dahdi/xpp/xpp_dahdi.c') diff --git a/drivers/dahdi/xpp/xpp_dahdi.c b/drivers/dahdi/xpp/xpp_dahdi.c index a53f2d2..1bfed84 100644 --- a/drivers/dahdi/xpp/xpp_dahdi.c +++ b/drivers/dahdi/xpp/xpp_dahdi.c @@ -1082,14 +1082,9 @@ int xpd_dahdi_postregister(xpd_t *xpd) */ void xpd_dahdi_preunregister(xpd_t *xpd) { - unsigned long flags; if (!xpd) return; XPD_DBG(DEVICES, xpd, "\n"); - spin_lock_irqsave(&xpd->lock, flags); - xpd->card_present = 0; - xpd_setstate(xpd, XPD_STATE_NOHW); - spin_unlock_irqrestore(&xpd->lock, flags); update_xpd_status(xpd, DAHDI_ALARM_NOTOPEN); if(xpd->card_present) CALL_PHONE_METHOD(card_dahdi_preregistration, xpd, 0); -- cgit v1.2.3