Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 254140
b: refs/heads/master
c: 57f2104
h: refs/heads/master
v: v3
  • Loading branch information
Russ Gorby authored and Greg Kroah-Hartman committed Jun 16, 2011
1 parent 27446f3 commit 689cd68
Show file tree
Hide file tree
Showing 2 changed files with 3 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: 7263287af93db4d5cf324a30546f2143419b7900
refs/heads/master: 57f2104f39995bac332ddc492fbf60aa28e0c35e
3 changes: 2 additions & 1 deletion trunk/drivers/tty/n_gsm.c
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,8 @@ static int gsm_dlci_data_output_framed(struct gsm_mux *gsm,
*dp++ = last << 7 | first << 6 | 1; /* EA */
len--;
}
memcpy(dp, skb_pull(dlci->skb, len), len);
memcpy(dp, dlci->skb->data, len);
skb_pull(dlci->skb, len);
__gsm_data_queue(dlci, msg);
if (last)
dlci->skb = NULL;
Expand Down

0 comments on commit 689cd68

Please sign in to comment.