| Message ID | 1350306806-5688-2-git-send-email-lee.jones@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Acked-by: Ulf Hansson <ulf.hansson@linaro.org> I assume this shall go into 3.7, right? Kind regards Ulf Hansson On 15 October 2012 15:13, Lee Jones <lee.jones@linaro.org> wrote: > 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. > > Cc: alsa-devel@alsa-project.org > Cc: Liam Girdwood <lrg@ti.com> > Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> > Acked-by: Linus Walleij <linus.walleij@linaro.org> > Signed-off-by: Lee Jones <lee.jones@linaro.org> > --- > sound/soc/ux500/ux500_msp_i2s.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c > index b7c996e..a26c6bf 100644 > --- a/sound/soc/ux500/ux500_msp_i2s.c > +++ b/sound/soc/ux500/ux500_msp_i2s.c > @@ -18,6 +18,7 @@ > #include <linux/pinctrl/consumer.h> > #include <linux/delay.h> > #include <linux/slab.h> > +#include <linux/io.h> > #include <linux/of.h> > > #include <mach/hardware.h> > @@ -697,14 +698,11 @@ int ux500_msp_i2s_init_msp(struct platform_device *pdev, > platform_data = devm_kzalloc(&pdev->dev, > sizeof(struct msp_i2s_platform_data), GFP_KERNEL); > if (!platform_data) > - ret = -ENOMEM; > + return -ENOMEM; > } > } else > if (!platform_data) > - ret = -EINVAL; > - > - if (ret) > - goto err_res; > + return -EINVAL; > > dev_dbg(&pdev->dev, "%s: Enter (name: %s, id: %d).\n", __func__, > pdev->name, platform_data->id); > -- > 1.7.9.5 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On Wed, Oct 24, 2012 at 11:34:00AM +0200, Ulf Hansson wrote: > Acked-by: Ulf Hansson <ulf.hansson@linaro.org> > > I assume this shall go into 3.7, right? > > Kind regards > Ulf Hansson You may recall that only yesterday I reminded you not to top post...
On 24 October 2012 12:27, Mark Brown <broonie@opensource.wolfsonmicro.com> wrote: > On Wed, Oct 24, 2012 at 11:34:00AM +0200, Ulf Hansson wrote: >> Acked-by: Ulf Hansson <ulf.hansson@linaro.org> >> >> I assume this shall go into 3.7, right? >> >> Kind regards >> Ulf Hansson > > You may recall that only yesterday I reminded you not to top post... Sorry, I have a short memory. :-) I will try to improve. Kind regards Ulf Hansson
diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c index b7c996e..a26c6bf 100644 --- a/sound/soc/ux500/ux500_msp_i2s.c +++ b/sound/soc/ux500/ux500_msp_i2s.c @@ -18,6 +18,7 @@ #include <linux/pinctrl/consumer.h> #include <linux/delay.h> #include <linux/slab.h> +#include <linux/io.h> #include <linux/of.h> #include <mach/hardware.h> @@ -697,14 +698,11 @@ int ux500_msp_i2s_init_msp(struct platform_device *pdev, platform_data = devm_kzalloc(&pdev->dev, sizeof(struct msp_i2s_platform_data), GFP_KERNEL); if (!platform_data) - ret = -ENOMEM; + return -ENOMEM; } } else if (!platform_data) - ret = -EINVAL; - - if (ret) - goto err_res; + return -EINVAL; dev_dbg(&pdev->dev, "%s: Enter (name: %s, id: %d).\n", __func__, pdev->name, platform_data->id);