Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325687
b: refs/heads/master
c: 88ed2a6
h: refs/heads/master
i:
  325685: f78f47f
  325683: 511ec47
  325679: 95bb92c
v: v3
  • Loading branch information
Russ Gorby authored and Greg Kroah-Hartman committed Aug 16, 2012
1 parent 7ca1c79 commit 66a80ce
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 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: 329e56780e514a7ab607bcb51a52ab0dc2669414
refs/heads/master: 88ed2a60610974443335c924d7cb8e5dcf9dbdc1
7 changes: 5 additions & 2 deletions trunk/drivers/tty/n_gsm.c
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@ static int gsm_dlci_data_output_framed(struct gsm_mux *gsm,

/* dlci->skb is locked by tx_lock */
if (dlci->skb == NULL) {
dlci->skb = skb_dequeue(&dlci->skb_list);
dlci->skb = skb_dequeue_tail(&dlci->skb_list);
if (dlci->skb == NULL)
return 0;
first = 1;
Expand All @@ -892,8 +892,11 @@ static int gsm_dlci_data_output_framed(struct gsm_mux *gsm,

/* FIXME: need a timer or something to kick this so it can't
get stuck with no work outstanding and no buffer free */
if (msg == NULL)
if (msg == NULL) {
skb_queue_tail(&dlci->skb_list, dlci->skb);
dlci->skb = NULL;
return -ENOMEM;
}
dp = msg->data;

if (dlci->adaption == 4) { /* Interruptible framed (Packetised Data) */
Expand Down

0 comments on commit 66a80ce

Please sign in to comment.