summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-12-02Merge remote-tracking branch 'asoc/topic/wm8741' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/wm8510' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/wm8400' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/wm8350' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/wm2200' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/wm2000' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/wm0010' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/ux500' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/tlv320aic32x4' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/si476x' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/samsung' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/rt5631' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/omap' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/max98090' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/max9768' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/log' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/lm49453' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/jz4740' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/jack' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/hotplug' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/fsl' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/fsi' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/dmaengine' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/davinci' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/da9055' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/da7210' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/atmel' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/arizona' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/ak4642' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/ak4535' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/ak4104' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/adsp' into asoc-nextMark Brown
2012-12-02Merge remote-tracking branch 'asoc/topic/ab8500' into asoc-nextMark Brown
2012-12-02ASoC: atmel-pcm: dma support based on pcm dmaengineBo Shen
Specify overrun bit in interrupt mask Add dmaengine specific routines Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> [voice.shen@atmel.com: adapt to soc dmaengine framework] Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-02ASoC: atmel-pcm: split into two fileBo Shen
This patch is split original atmel-pcm.c into new atmel-pcm.c and atmel-pcm-pdc.c two files. The new atmel-pcm.c is the share routine while will be used for pdc or dma transfer. Using SND_ATMEL_SOC_PDC to select using PDC for audio transfer Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-02ASoC: wm5102: Correct base address for Y regionMark Brown
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-02ASoC: wm8960: Use devm_regmap_init_i2c()Sachin Kamat
devm_regmap_init_i2c() is device managed and makes error handling and code cleanup simpler. There was no explicit regmap_exit call in this function which was probably a bug. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-02ASoC: wm8955: Use devm_regmap_init_i2c()Sachin Kamat
devm_regmap_init_i2c() is device managed and makes error handling and code cleanup simpler. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-02ASoC: max9768: Use devm_regmap_init_i2c()Sachin Kamat
devm_regmap_init_i2c() is device managed and makes error handling and code cleanup simpler. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-02ASoC: wm8978: Use devm_regmap_init_i2c()Sachin Kamat
devm_regmap_init_i2c() is device managed and makes error handling and code cleanup simpler. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-02ASoC: wm8962: Use devm_regmap_init_i2c()Sachin Kamat
devm_regmap_init_i2c() is device managed and makes error handling and code cleanup simpler. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-02ASoC: wm8993: Use devm_regmap_init_i2c()Sachin Kamat
devm_regmap_init_i2c() is device managed and makes error handling and code cleanup simpler. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-02ASoC: wm9081: Use devm_regmap_init_i2c()Sachin Kamat
devm_regmap_init_i2c() is device managed and makes error handling and code cleanup simpler. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-02ASoC: wm9090: Use devm_regmap_init_i2c()Sachin Kamat
devm_regmap_init_i2c() is device managed and makes error handling and code cleanup simpler. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-12-01Merge branch 'for-3.7-fixes' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq Pull late workqueue fixes from Tejun Heo: "Unfortunately, I have two really late fixes. One was for a long-standing bug and queued for 3.8 but I found out about a regression introduced during 3.7-rc1 two days ago, so I'm sending out the two fixes together. The first (long-standing) one is rescuer_thread() entering exit path w/ TASK_INTERRUPTIBLE. It only triggers on workqueue destructions which isn't very frequent and the exit path can usually survive being called with TASK_INTERRUPT, so it was hidden pretty well. Apparently, if you're reiserfs, this could lead to the exiting kthread sleeping indefinitely holding a mutex, which is never good. The fix is simple - restoring TASK_RUNNING before returning from the kthread function. The second one is introduced by the new mod_delayed_work(). mod_delayed_work() was missing special case handling for 0 delay. Instead of queueing the work item immediately, it queued the timer which expires on the closest next tick. Some users of the new function converted from "[__]cancel_delayed_work() + queue_delayed_work()" combination became unhappy with the extra delay. Block unplugging led to noticeably higher number of context switches and intel 6250 wireless failed to associate with WPA-Enterprise network. The fix, again, is fairly simple. The 0 delay special case logic from queue_delayed_work_on() should be moved to __queue_delayed_work() which is shared by both queue_delayed_work_on() and mod_delayed_work_on(). The first one is difficult to trigger and the failure mode for the latter isn't completely catastrophic, so missing these two for 3.7 wouldn't make it a disastrous release, but both bugs are nasty and the fixes are fairly safe" * 'for-3.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: workqueue: mod_delayed_work_on() shouldn't queue timer on 0 delay workqueue: exit rescuer_thread() as TASK_RUNNING
2012-12-01Merge git://git.infradead.org/users/dwmw2/atmDavid S. Miller
David Woodhouse says: ==================== This is the result of pulling on the thread started by Krzysztof Mazur's original patch 'pppoatm: don't send frames to destroyed vcc'. Various problems in the pppoatm and br2684 code are solved, some of which were easily triggered and would panic the kernel. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
2012-12-018139cp: fix coherent mapping leak in error path.françois romieu
cp_open [...] rc = cp_alloc_rings(cp); if (rc) return rc; cp_alloc_rings [...] mem = dma_alloc_coherent(&cp->pdev->dev, CP_RING_BYTES, &cp->ring_dma, GFP_KERNEL); - cp_alloc_rings never frees the coherent mapping it allocates - neither do cp_open when cp_alloc_rings fails Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2012-12-01tcp: fix crashes in do_tcp_sendpages()Eric Dumazet
Recent network changes allowed high order pages being used for skb fragments. This uncovered a bug in do_tcp_sendpages() which was assuming its caller provided an array of order-0 page pointers. We only have to deal with a single page in this function, and its order is irrelevant. Reported-by: Willy Tarreau <w@1wt.eu> Tested-by: Willy Tarreau <w@1wt.eu> Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>