Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / isdn / mISDN / l1oip_core.c

diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c
index 22f38e48ac4eddca6e27afa74df9c5122b940e4f..bd526f664a3966217f0317497a943deba197982e 100644 (file)
--- a/drivers/isdn/mISDN/l1oip_core.c
+++ b/drivers/isdn/mISDN/l1oip_core.c
@@ -972,7 +972,7 @@ channel_dctrl(struct dchannel *dch, struct mISDN_ctrl_req *cq)
                if (debug & DEBUG_L1OIP_SOCKET)
                        printk(KERN_DEBUG "%s: got new ip address from user "
                                "space.\n", __func__);
-                       l1oip_socket_open(hc);
+               l1oip_socket_open(hc);
                break;
        case MISDN_CTRL_UNSETPEER:
                if (debug & DEBUG_L1OIP_SOCKET)
@@ -1269,6 +1269,8 @@ release_card(struct l1oip *hc)
        if (timer_pending(&hc->timeout_tl))
                del_timer(&hc->timeout_tl);
 
+       cancel_work_sync(&hc->workq);
+
        if (hc->socket_thread)
                l1oip_socket_close(hc);