Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 150467
b: refs/heads/master
c: ba3af34
h: refs/heads/master
i:
  150465: 8976228
  150463: 695dc2c
v: v3
  • Loading branch information
Andreas Eversberg authored and David S. Miller committed May 25, 2009
1 parent 9517b6e commit 40aead4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 44e095897d745a03d71611fd318f26d8b12a4771
refs/heads/master: ba3af34ec9866dddac36c15947f867eb8e889bbc
4 changes: 3 additions & 1 deletion trunk/drivers/isdn/mISDN/dsp_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,8 @@ dsp_function(struct mISDNchannel *ch, struct sk_buff *skb)
break;
}

spin_lock_irqsave(&dsp_lock, flags);

/* decrypt if enabled */
if (dsp->bf_enable)
dsp_bf_decrypt(dsp, skb->data, skb->len);
Expand Down Expand Up @@ -741,11 +743,11 @@ dsp_function(struct mISDNchannel *ch, struct sk_buff *skb)
}
}
/* we need to process receive data if software */
spin_lock_irqsave(&dsp_lock, flags);
if (dsp->pcm_slot_tx < 0 && dsp->pcm_slot_rx < 0) {
/* process data from card at cmx */
dsp_cmx_receive(dsp, skb);
}

spin_unlock_irqrestore(&dsp_lock, flags);

if (dsp->rx_disabled) {
Expand Down

0 comments on commit 40aead4

Please sign in to comment.