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

Commit f072f91a authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Mark Brown
Browse files

ASoC: wm0010: fix error path 



Fix the error path so that we can free the allocated memory on the error
path instead of releasing them individually on each error.

Signed-off-by: default avatarSudip Mukherjee <sudip@vectorindia.org>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2ace47be

sound/soc/codecs/wm0010.c

+10 −12
Original line number Diff line number Diff line
@@ -663,10 +663,8 @@ static int wm0010_boot(struct snd_soc_codec *codec) 
		}



		img_swap = kzalloc(len, GFP_KERNEL | GFP_DMA);

		if (!img_swap) {

			kfree(out);

			goto abort;

		}

		if (!img_swap)

			goto abort_out;



		/* We need to re-order for 0010 */

		byte_swap_64((u64 *)&pll_rec, img_swap, len);
@@ -681,20 +679,16 @@ static int wm0010_boot(struct snd_soc_codec *codec) 
		spi_message_add_tail(&t, &m);



		ret = spi_sync(spi, &m);

		if (ret != 0) {

		if (ret) {

			dev_err(codec->dev, "First PLL write failed: %d\n", ret);

			kfree(img_swap);

			kfree(out);

			goto abort;

			goto abort_swap;

		}



		/* Use a second send of the message to get the return status */

		ret = spi_sync(spi, &m);

		if (ret != 0) {

		if (ret) {

			dev_err(codec->dev, "Second PLL write failed: %d\n", ret);

			kfree(img_swap);

			kfree(out);

			goto abort;

			goto abort_swap;

		}



		p = (u32 *)out;
@@ -727,6 +721,10 @@ static int wm0010_boot(struct snd_soc_codec *codec) 


	return 0;



abort_swap:

	kfree(img_swap);

abort_out:

	kfree(out);

abort:

	/* Put the chip back into reset */

	wm0010_halt(codec);