Acked-by: Ulf Hansson <[email protected]> I assume this shall go into 3.7, right?
Kind regards Ulf Hansson On 15 October 2012 15:13, Lee Jones <[email protected]> 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: [email protected] > Cc: Liam Girdwood <[email protected]> > Cc: Mark Brown <[email protected]> > Acked-by: Linus Walleij <[email protected]> > Signed-off-by: Lee Jones <[email protected]> > --- > 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 > [email protected] > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
