Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05304949 authored by Lee Jones's avatar Lee Jones Committed by Mark Brown
Browse files

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



Some ux500_msp_i2s patches clashed with:

b18e93a4
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: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 39013bd6

sound/soc/ux500/ux500_msp_i2s.c

+3 −5
Original line number Diff line number Diff line
@@ -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);