diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-09-15 02:24:42 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-09-15 02:24:42 -0400 |
| commit | 5d037f9064a8f3b9abbe383cdfb35e159d813711 (patch) | |
| tree | 2a2445271ee818c360c42408a324d2945a6dd9f7 /drivers/net/tun.c | |
| parent | 64f1e00d8edb54f5d25fb0114a46050fb8340df4 (diff) | |
| parent | 985b11fa8064d55d0d5a84e68667434598911bb2 (diff) | |
Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for 3.6
A bigger set of updates than I'm entirely comfortable with - things
backed up a bit due to travel. As ever the majority of these are small,
focused updates for specific drivers though there are a couple of core
changes. There's been good exposure in -next.
The AT91 patch fixes a build break.
Diffstat (limited to 'drivers/net/tun.c')
| -rw-r--r-- | drivers/net/tun.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 926d4db5cb38..3a16d4fdaa05 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c | |||
| @@ -187,7 +187,6 @@ static void __tun_detach(struct tun_struct *tun) | |||
| 187 | netif_tx_lock_bh(tun->dev); | 187 | netif_tx_lock_bh(tun->dev); |
| 188 | netif_carrier_off(tun->dev); | 188 | netif_carrier_off(tun->dev); |
| 189 | tun->tfile = NULL; | 189 | tun->tfile = NULL; |
| 190 | tun->socket.file = NULL; | ||
| 191 | netif_tx_unlock_bh(tun->dev); | 190 | netif_tx_unlock_bh(tun->dev); |
| 192 | 191 | ||
| 193 | /* Drop read queue */ | 192 | /* Drop read queue */ |