From: Lee Jones <lee.jones@linaro.org>
Date: Mon, 15 Oct 2012 13:13:26 +0000 (+0100)
Subject: ASoC: ux500_msp_i2s: Fix devm_* and return code merge error
X-Git-Tag: v3.7-rc3~17^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05304949332c6d2c7b50f2d0f666a52369f09ced;p=pandora-kernel.git

ASoC: ux500_msp_i2s: Fix devm_* and return code merge error

Some ux500_msp_i2s patches clashed with:

b18e93a493626c1446f9788ebd5844d008bbf71c
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>
---

Reading git-diff-tree failed