summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-02-11Merge tag 'asoc-3.9' of ↵Takashi Iwai532-4206/+11519
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next ASoC: Updates for v3.9 A fairly quiet release for ASoC: - Support for a wider range of hardware in the compressed stream code. - The ability to mute capture streams as well as playback streams while inactive. - DT support for AK4642, FSI, Samsung I2S and WM8962. - AC'97 support for Tegra. - New driver for max98090, replacing the stub which was there. Due to dependencies we've also got support for asynchronous I/O in regmap and DTification of DMA support for Samsung platforms (used only by the I2S driver and SPI) merged here as well.
2013-02-11ALSA: usb-audio: add support for M-Audio FT C600Matt Gruskin6-21/+139
Adds quirks and mixer support for the M-Audio Fast Track C600 USB audio interface. This device is very similar to the C400 - the C600 simply has some more inputs and outputs, so the existing C400 support is extended to support this device as well. Signed-off-by: Matt Gruskin <matthew.gruskin@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-02-11Merge remote-tracking branch 'asoc/topic/wm8993' into asoc-nextMark Brown1-19/+22
2013-02-11Merge remote-tracking branch 'asoc/topic/wm8985' into asoc-nextMark Brown1-23/+20
2013-02-11Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-nextMark Brown2-17/+36
2013-02-11Merge remote-tracking branch 'asoc/topic/wm8804' into asoc-nextMark Brown1-3/+0
2013-02-11Merge remote-tracking branch 'asoc/topic/wm8350' into asoc-nextMark Brown1-6/+4
2013-02-11Merge remote-tracking branch 'asoc/topic/wm5100' into asoc-nextMark Brown1-0/+13
2013-02-11Merge remote-tracking branch 'asoc/topic/wm2200' into asoc-nextMark Brown2-1/+79
2013-02-11Merge remote-tracking branch 'asoc/topic/wm2000' into asoc-nextMark Brown3-7/+34
2013-02-11Merge remote-tracking branch 'asoc/topic/twl' into asoc-nextMark Brown9-600/+313
2013-02-11Merge remote-tracking branch 'asoc/topic/tlv320dac33' into asoc-nextMark Brown1-16/+0
2013-02-11Merge remote-tracking branch 'asoc/topic/tlv320aic3x' into asoc-nextMark Brown7-15/+106
2013-02-11Merge remote-tracking branch 'asoc/topic/tegra' into asoc-nextMark Brown12-4/+918
2013-02-11Merge remote-tracking branch 'asoc/topic/simple-card' into asoc-nextMark Brown8-120/+119
2013-02-11Merge remote-tracking branch 'asoc/topic/samsung' into asoc-nextMark Brown16-129/+438
2013-02-11Merge remote-tracking branch 'asoc/topic/pxa' into asoc-nextMark Brown3-38/+28
2013-02-11Merge remote-tracking branch 'asoc/topic/omap' into asoc-nextMark Brown2-11/+5
2013-02-11Merge remote-tracking branch 'asoc/topic/of' into asoc-nextMark Brown3-1/+110
2013-02-11Merge remote-tracking branch 'asoc/topic/mxs' into asoc-nextMark Brown2-44/+21
2013-02-11Merge remote-tracking branch 'asoc/topic/max98090' into asoc-nextMark Brown3-432/+3831
2013-02-11Merge remote-tracking branch 'asoc/topic/fsi' into asoc-nextMark Brown7-262/+122
2013-02-11Merge remote-tracking branch 'asoc/topic/cs42l52' into asoc-nextMark Brown1-3/+1
2013-02-11Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-nextMark Brown3-0/+61
2013-02-11Merge remote-tracking branch 'asoc/topic/core' into asoc-nextMark Brown4-19/+15
2013-02-11Merge remote-tracking branch 'asoc/topic/compress' into asoc-nextMark Brown5-21/+131
2013-02-11Merge remote-tracking branch 'asoc/topic/atmel' into asoc-nextMark Brown8-26/+16
2013-02-11Merge remote-tracking branch 'asoc/topic/arizona' into asoc-nextMark Brown5-114/+418
2013-02-11Merge remote-tracking branch 'asoc/topic/ak4642' into asoc-nextMark Brown2-2/+48
2013-02-11Merge remote-tracking branch 'asoc/topic/adsp' into asoc-nextMark Brown7-82/+861
2013-02-11Merge remote-tracking branch 'asoc/fix/wm2200' into asoc-nextMark Brown1-2/+2
2013-02-11Merge remote-tracking branch 'asoc/fix/wm2000' into asoc-nextMark Brown1-3/+28
2013-02-11Merge remote-tracking branch 'asoc/fix/ux500' into asoc-nextMark Brown1-1/+1
2013-02-11Merge remote-tracking branch 'asoc/fix/tlv320aic3x' into asoc-nextMark Brown1-2/+2
2013-02-11Merge remote-tracking branch 'asoc/fix/samsung' into asoc-nextMark Brown1-1/+1
2013-02-11Merge remote-tracking branch 'asoc/fix/dwc' into asoc-nextMark Brown1-0/+4
2013-02-11Merge remote-tracking branch 'asoc/fix/davinci' into asoc-nextMark Brown1-1/+1
2013-02-11Merge remote-tracking branch 'asoc/fix/arizona' into asoc-nextMark Brown1-3/+12
2013-02-11Merge remote-tracking branch 'asoc/fix/adsp' into asoc-nextMark Brown1-3/+11
2013-02-11ASoC: wm_adsp: round to 4-byte boundary for coeff file blocksChris Rattray1-1/+7
Signed-off-by: Chris Rattray <crattray@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2013-02-10ALSA: hda - Fix memory leak and error handling in CA0132 DSP loaderTakashi Iwai2-4/+17
This patch fixes a few obvious bugs in DSP loader stuff: - Fix possible memory leaks in the error path - Avoid double-free calls in dma_reset() - Properly set/unset WC bits for DMA buffers - Add missing error status checks Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-02-10ALSA: CA0132: Improve the DSP transfer timeout calculationsIan Minett1-16/+25
Base the DSP firmware transfer and communication timeouts on jiffy values. Signed-off-by: Ian Minett <ian_minett@creativelabs.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-02-10ALSA: hda_intel: Add Device IDs for Intel Wellsburg PCHJames Ralston1-0/+5
This patch adds the HD Audio Device IDs for the Intel Wellsburg PCH Signed-off-by: James Ralston <james.d.ralston@intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2013-02-09Linux 3.8-rc7v3.8-rc7Linus Torvalds1-1/+1
2013-02-09Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds4-5/+26
Pull ARM fixes from Russell King: "I was going to hold these off until v3.8 was out, and send them with a stable tag, but as everyone else is pushing much bigger fixes which Linus is accepting, let's save people from the hastle of having to patch v3.8 back into working or use a stable kernel. Looking at the diffstat, this really is high value for its size; this is miniscule compared to how the -rc6 to tip diffstat currently looks. So, four patches in this set: - Punit Agrawal reports that the kernel no longer boots on MPCore due to a new assumption made in the GIC code which isn't true of earlier GIC designs. This is the biggest change in this set. - Punit's boot log also revealed a bunch of WARN_ON() dumps caused by the DT-ification of the GIC support without fixing up non-DT Realview - which now sees a greater number of interrupts than it did before. - A fix for the DMA coherent code from Marek which uses the wrong check for atomic allocations; this can result in spinlock lockups or other nasty effects. - A fix from Will, which will affect all Android based platforms if not applied (which use the 2G:2G VM split) - this causes particularly 'make' to misbehave unless this bug is fixed." * 'fixes' of git://git.linaro.org/people/rmk/linux-arm: ARM: 7641/1: memory: fix broken mmap by ensuring TASK_UNMAPPED_BASE is aligned ARM: DMA mapping: fix bad atomic test ARM: realview: ensure that we have sufficient IRQs available ARM: GIC: fix GIC cpumask initialization
2013-02-09Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds68-348/+649
Pull networking fixes from David Miller: 1) Revert iwlwifi reclaimed packet tracking, it causes problems for a bunch of folks. From Emmanuel Grumbach. 2) Work limiting code in brcmsmac wifi driver can clear tx status without processing the event. From Arend van Spriel. 3) rtlwifi USB driver processes wrong SKB, fix from Larry Finger. 4) l2tp tunnel delete can race with close, fix from Tom Parkin. 5) pktgen_add_device() failures are not checked at all, fix from Cong Wang. 6) Fix unintentional removal of carrier off from tun_detach(), otherwise we confuse userspace, from Michael S. Tsirkin. 7) Don't leak socket reference counts and ubufs in vhost-net driver, from Jason Wang. 8) vmxnet3 driver gets it's initial carrier state wrong, fix from Neil Horman. 9) Protect against USB networking devices which spam the host with 0 length frames, from Bjørn Mork. 10) Prevent neighbour overflows in ipv6 for locally destined routes, from Marcelo Ricardo. This is the best short-term fix for this, a longer term fix has been implemented in net-next. 11) L2TP uses ipv4 datagram routines in it's ipv6 code, whoops. This mistake is largely because the ipv6 functions don't even have some kind of prefix in their names to suggest they are ipv6 specific. From Tom Parkin. 12) Check SYN packet drops properly in tcp_rcv_fastopen_synack(), from Yuchung Cheng. 13) Fix races and TX skb freeing bugs in via-rhine's NAPI support, from Francois Romieu and your's truly. 14) Fix infinite loops and divides by zero in TCP congestion window handling, from Eric Dumazet, Neal Cardwell, and Ilpo Järvinen. 15) AF_PACKET tx ring handling can leak kernel memory to userspace, fix from Phil Sutter. 16) Fix error handling in ipv6 GRE tunnel transmit, from Tommi Rantala. 17) Protect XEN netback driver against hostile frontend putting garbage into the rings, don't leak pages in TX GOP checking, and add proper resource releasing in error path of xen_netbk_get_requests(). From Ian Campbell. 18) SCTP authentication keys should be cleared out and released with kzfree(), from Daniel Borkmann. 19) L2TP is a bit too clever trying to maintain skb->truesize, and ends up corrupting socket memory accounting to the point where packet sending is halted indefinitely. Just remove the adjustments entirely, they aren't really needed. From Eric Dumazet. 20) ATM Iphase driver uses a data type with the same name as the S390 headers, rename to fix the build. From Heiko Carstens. 21) Fix a typo in copying the inner network header offset from one SKB to another, from Pravin B Shelar. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (56 commits) net: sctp: sctp_endpoint_free: zero out secret key data net: sctp: sctp_setsockopt_auth_key: use kzfree instead of kfree atm/iphase: rename fregt_t -> ffreg_t net: usb: fix regression from FLAG_NOARP code l2tp: dont play with skb->truesize net: sctp: sctp_auth_key_put: use kzfree instead of kfree netback: correct netbk_tx_err to handle wrap around. xen/netback: free already allocated memory on failure in xen_netbk_get_requests xen/netback: don't leak pages on failure in xen_netbk_tx_check_gop. xen/netback: shutdown the ring if it contains garbage. net: qmi_wwan: add more Huawei devices, including E320 net: cdc_ncm: add another Huawei vendor specific device ipv6/ip6_gre: fix error case handling in ip6gre_tunnel_xmit() tcp: fix for zero packets_in_flight was too broad brcmsmac: rework of mac80211 .flush() callback operation ssb: unregister gpios before unloading ssb bcma: unregister gpios before unloading bcma rtlwifi: Fix scheduling while atomic bug net: usbnet: fix tx_dropped statistics tcp: ipv6: Update MIB counters for drops ...
2013-02-08Merge branch 'sctp_keys'David S. Miller2-1/+6
Daniel Borkmann says: ==================== Cryptographically used keys should be zeroed out when our session ends resp. memory is freed, thus do not leave them somewhere in the memory. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
2013-02-08net: sctp: sctp_endpoint_free: zero out secret key dataDaniel Borkmann1-0/+5
On sctp_endpoint_destroy, previously used sensitive keying material should be zeroed out before the memory is returned, as we already do with e.g. auth keys when released. Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Acked-by: Vlad Yasevich <vyasevic@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2013-02-08net: sctp: sctp_setsockopt_auth_key: use kzfree instead of kfreeDaniel Borkmann1-1/+1
In sctp_setsockopt_auth_key, we create a temporary copy of the user passed shared auth key for the endpoint or association and after internal setup, we free it right away. Since it's sensitive data, we should zero out the key before returning the memory back to the allocator. Thus, use kzfree instead of kfree, just as we do in sctp_auth_key_put(). Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2013-02-08atm/iphase: rename fregt_t -> ffreg_tHeiko Carstens1-73/+73
We have conflicting type qualifiers for "freg_t" in s390's ptrace.h and the iphase atm device driver, which causes the compile error below. Unfortunately the s390 typedef can't be renamed, since it's a user visible api, nor can I change the include order in s390 code to avoid the conflict. So simply rename the iphase typedef to a new name. Fixes this compile error: In file included from drivers/atm/iphase.c:66:0: drivers/atm/iphase.h:639:25: error: conflicting type qualifiers for 'freg_t' In file included from next/arch/s390/include/asm/ptrace.h:9:0, from next/arch/s390/include/asm/lowcore.h:12, from next/arch/s390/include/asm/thread_info.h:30, from include/linux/thread_info.h:54, from include/linux/preempt.h:9, from include/linux/spinlock.h:50, from include/linux/seqlock.h:29, from include/linux/time.h:5, from include/linux/stat.h:18, from include/linux/module.h:10, from drivers/atm/iphase.c:43: next/arch/s390/include/uapi/asm/ptrace.h:197:3: note: previous declaration of 'freg_t' was here Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Acked-by: chas williams - CONTRACTOR <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>