diff options
author | 2013-10-19 22:31:14 +0200 | |
---|---|---|
committer | 2013-10-19 22:31:14 +0200 | |
commit | 20c87bd40e6c1ff7e31cc5eea4fb37829a57eb58 (patch) | |
tree | 528c2f113e428e060e185ccab7eab8d8e87c7d36 /net/lapb/lapb_timer.c | |
parent | ALSA: hdsp - info leak in snd_hdsp_hwdep_ioctl() (diff) | |
parent | Merge remote-tracking branch 'asoc/fix/tlv320aic3x' into asoc-linus (diff) | |
download | wireguard-linux-20c87bd40e6c1ff7e31cc5eea4fb37829a57eb58.tar.xz wireguard-linux-20c87bd40e6c1ff7e31cc5eea4fb37829a57eb58.zip |
Merge tag 'asoc-v3.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.12
A number of small, fairly unexciting, fixes for drivers - nothing stand
out.
Diffstat (limited to '')
-rw-r--r-- | net/lapb/lapb_timer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/lapb/lapb_timer.c b/net/lapb/lapb_timer.c index 54563ad8aeb1..355cc3b6fa4d 100644 --- a/net/lapb/lapb_timer.c +++ b/net/lapb/lapb_timer.c @@ -154,6 +154,7 @@ static void lapb_t1timer_expiry(unsigned long param) } else { lapb->n2count++; lapb_requeue_frames(lapb); + lapb_kick(lapb); } break; |