kernel_optimize_test/sound/soc
Lee Jones 0530494933 ASoC: ux500_msp_i2s: Fix devm_* and return code merge error
Some ux500_msp_i2s patches clashed with:

b18e93a493
ASoC: ux500_msp_i2s: better use devm functions and fix error return code

... leaving the driver uncompilable. This patch fixes the
issues encountered.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
2012-10-16 14:14:31 +09:00
..
atmel ASoC: Convert afeb9260 to table based DAPM init 2012-02-01 21:52:54 +00:00
au1x Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2012-01-14 13:05:21 -08:00
blackfin Merge branch 'asoc-omap' into for-3.7 2012-09-05 20:05:11 +08:00
cirrus Sound updates for 3.7-rc1 2012-10-09 07:07:14 +09:00
codecs Sound updates for 3.7-rc1 2012-10-09 07:07:14 +09:00
davinci ASoC: Davinci: McASP: add support new McASP IP Variant 2012-09-06 08:20:33 +08:00
dwc ASoC: dwc: Staticise non-exported i2s_start() 2012-07-04 19:15:43 +01:00
fsl Sound updates for 3.7-rc1 2012-10-09 07:07:14 +09:00
generic ASoC: add generic simple-card support 2012-04-13 11:29:25 +01:00
jz4740 ASoC: JZ4740: Replaced comma operators with semicolons. 2012-04-06 18:22:05 +01:00
kirkwood ARM: orion: move platform_data definitions 2012-09-19 17:42:17 +02:00
mid-x86 ASoC: mid-x86 - add support for compressed streams 2012-08-20 20:50:39 +01:00
mxs Merge branch 'asoc-omap' into for-3.7 2012-09-05 20:05:11 +08:00
nuc900 Merge branch 'master' into fixes 2012-01-13 15:00:22 +00:00
omap Sound updates for 3.7-rc1 2012-10-09 07:07:14 +09:00
pxa ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
s6000 ASoC: use proper defines for stream directions in pcm engines 2012-01-20 13:58:25 +00:00
samsung Sound updates for 3.7-rc1 2012-10-09 07:07:14 +09:00
sh ASoC: fsi: convert to devm_xxx() 2012-09-10 17:27:05 +08:00
spear ASoC: spear: correct the check for NULL dma_buffer pointer 2012-08-31 14:24:52 -07:00
tegra Sound updates for 3.7-rc1 2012-10-09 07:07:14 +09:00
txx9 dmaengine/dma_slave: introduce inline wrappers 2012-03-21 19:20:22 +05:30
ux500 ASoC: ux500_msp_i2s: Fix devm_* and return code merge error 2012-10-16 14:14:31 +09:00
Kconfig ASoC: Rename ep93xx soc directory to cirrus 2012-08-28 10:24:21 -07:00
Makefile ASoC: Rename ep93xx soc directory to cirrus 2012-08-28 10:24:21 -07:00
soc-cache.c ASoC: Remove rbtree register cache 2011-12-13 00:20:28 +08:00
soc-compress.c ASoC: soc-compress: Remove unused variable 2012-08-21 15:09:44 +01:00
soc-core.c Sound updates for 3.7-rc1 2012-10-09 07:07:14 +09:00
soc-dapm.c ASoC: dapm: Allow regulators to bypass as well as disable when idle 2012-09-26 12:29:59 +01:00
soc-dmaengine-pcm.c dmaengine: Add flags parameter to dmaengine_prep_dma_cyclic() 2012-09-24 18:35:29 +02:00
soc-io.c ASoC: io: Don't dereference regmap if we failed to get one 2012-06-23 12:11:32 +01:00
soc-jack.c Merge branch 'asoc-omap' into for-3.7 2012-09-05 20:05:11 +08:00
soc-pcm.c ASoC: dpcm: Allow FE to be opened without valid BE routes. 2012-07-06 19:06:58 +01:00
soc-utils.c ASoC: utils - Add support for a dummy codec driver. 2012-01-20 13:58:27 +00:00