Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e9c7813 authored by Karsten Keil's avatar Karsten Keil Committed by Linus Torvalds
Browse files

isdn: fix random hard freeze with AVM cards using b1dma 



This fixes the hard freeze debugded for AVM C4 cards using the b1dma
interface.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: default avatarKarsten Keil <kkeil@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent eac141de

drivers/isdn/hardware/avm/b1dma.c

+19 −9
Original line number Diff line number Diff line
@@ -486,11 +486,13 @@ static void b1dma_handle_rx(avmcard *card) 
					card->name);

		} else {

			memcpy(skb_put(skb, MsgLen), card->msgbuf, MsgLen);

			if (CAPIMSG_CMD(skb->data) == CAPI_DATA_B3_CONF)

			if (CAPIMSG_CMD(skb->data) == CAPI_DATA_B3_CONF) {

				spin_lock(&card->lock);

				capilib_data_b3_conf(&cinfo->ncci_head, ApplId,

					CAPIMSG_NCCI(skb->data),

					CAPIMSG_MSGID(skb->data));



				spin_unlock(&card->lock);

			}

			capi_ctr_handle_message(ctrl, ApplId, skb);

		}

		break;
@@ -500,9 +502,9 @@ static void b1dma_handle_rx(avmcard *card) 
		ApplId = _get_word(&p);

		NCCI = _get_word(&p);

		WindowSize = _get_word(&p);



		spin_lock(&card->lock);

		capilib_new_ncci(&cinfo->ncci_head, ApplId, NCCI, WindowSize);



		spin_unlock(&card->lock);

		break;



	case RECEIVE_FREE_NCCI:
@@ -510,9 +512,11 @@ static void b1dma_handle_rx(avmcard *card) 
		ApplId = _get_word(&p);

		NCCI = _get_word(&p);



		if (NCCI != 0xffffffff)

		if (NCCI != 0xffffffff) {

			spin_lock(&card->lock);

			capilib_free_ncci(&cinfo->ncci_head, ApplId, NCCI);



			spin_unlock(&card->lock);

		}

		break;



	case RECEIVE_START:
@@ -751,10 +755,10 @@ void b1dma_reset_ctr(struct capi_ctr *ctrl) 


	spin_lock_irqsave(&card->lock, flags);

 	b1dma_reset(card);

	spin_unlock_irqrestore(&card->lock, flags);



	memset(cinfo->version, 0, sizeof(cinfo->version));

	capilib_release(&cinfo->ncci_head);

	spin_unlock_irqrestore(&card->lock, flags);

	capi_ctr_reseted(ctrl);

}
@@ -803,8 +807,11 @@ void b1dma_release_appl(struct capi_ctr *ctrl, u16 appl) 
	avmcard *card = cinfo->card;

	struct sk_buff *skb;

	void *p;

	unsigned long flags;



	spin_lock_irqsave(&card->lock, flags);

	capilib_release_appl(&cinfo->ncci_head, appl);

	spin_unlock_irqrestore(&card->lock, flags);



	skb = alloc_skb(7, GFP_ATOMIC);

	if (!skb) {
@@ -832,10 +839,13 @@ u16 b1dma_send_message(struct capi_ctr *ctrl, struct sk_buff *skb) 
	u16 retval = CAPI_NOERROR;



 	if (CAPIMSG_CMD(skb->data) == CAPI_DATA_B3_REQ) {

		unsigned long flags;

		spin_lock_irqsave(&card->lock, flags);

		retval = capilib_data_b3_req(&cinfo->ncci_head,

					     CAPIMSG_APPID(skb->data),

					     CAPIMSG_NCCI(skb->data),

					     CAPIMSG_MSGID(skb->data));

		spin_unlock_irqrestore(&card->lock, flags);

	}

	if (retval == CAPI_NOERROR) 

		b1dma_queue_tx(card, skb);