summaryrefslogtreecommitdiff
path: root/net/ipv6/ip6_udp_tunnel.c
diff options
context:
space:
mode:
authorLABBE Corentin <clabbe.montjoie@gmail.com>2017-02-08 09:31:13 +0100
committerDavid S. Miller <davem@davemloft.net>2017-02-08 15:11:25 -0500
commit8a70aeca80c2425b60ff821140b5b5c141e28ba1 (patch)
tree094a2ccf44fa5d2e331072b04e911814d3278227 /net/ipv6/ip6_udp_tunnel.c
parenta5f48adc316aa21944c19019583fb9933af01b9a (diff)
net: stmmac: Use readl_poll_timeout
The dwmac_dma_reset function use an open coded of readl_poll_timeout(). Replace the open coded handling with the proper function. Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_udp_tunnel.c')
0 files changed, 0 insertions, 0 deletions
amp;id=396bf4cd835e62d70fad4a03a8963e61f19021f2&id2=7c2cf1c4615cc2f576d0604406cdf0065f00b83b'>diff)
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu: - use-after-free in algif_aead - modular aesni regression when pcbc is modular but absent - bug causing IO page faults in ccp - double list add in ccp - NULL pointer dereference in qat (two patches) - panic in chcr - NULL pointer dereference in chcr - out-of-bound access in chcr * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: chcr - Fix key length for RFC4106 crypto: algif_aead - Fix kernel panic on list_del crypto: aesni - Fix failure when pcbc module is absent crypto: ccp - Fix double add when creating new DMA command crypto: ccp - Fix DMA operations when IOMMU is enabled crypto: chcr - Check device is allocated before use crypto: chcr - Fix panic on dma_unmap_sg crypto: qat - zero esram only for DH85x devices crypto: qat - fix bar discovery for c62x
Diffstat (limited to 'sound/soc/codecs/wm8731.c')