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

Commit 324a7fb0 authored by Fabio Estevam's avatar Fabio Estevam Committed by Mark Brown
Browse files

ASoC: mxs-saif: Use a signed integer for error value 



saif->id and saif->master_id are unsigned, so they can not be negative.

Fix the following warning when building with W=1 option:

sound/soc/mxs/mxs-saif.c: In function 'mxs_saif_probe':
sound/soc/mxs/mxs-saif.c:676:2: warning: comparison of unsigned expression < 0 is always false [-Wtype-limits]
sound/soc/mxs/mxs-saif.c:688:3: warning: comparison of unsigned expression < 0 is always false [-Wtype-limits]
sound/soc/mxs/mxs-saif.c:692:2: warning: comparison of unsigned expression < 0 is always false [-Wtype-limits]

Use a signed variable 'ret' to handle the error values.

Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 4498a3ca

sound/soc/mxs/mxs-saif.c

+12 −7
Original line number Diff line number Diff line
@@ -672,9 +672,12 @@ static int mxs_saif_probe(struct platform_device *pdev) 
	if (!saif)

		return -ENOMEM;



	saif->id = of_alias_get_id(np, "saif");

	if (saif->id < 0)

		return saif->id;

	ret = of_alias_get_id(np, "saif");

	if (ret < 0)

		return ret;

	else

		saif->id = ret;



	/*

	 * If there is no "fsl,saif-master" phandle, it's a saif

	 * master.  Otherwise, it's a slave and its phandle points
@@ -684,12 +687,14 @@ static int mxs_saif_probe(struct platform_device *pdev) 
	if (!master) {

		saif->master_id = saif->id;

	} else {

		saif->master_id = of_alias_get_id(master, "saif");

		if (saif->master_id < 0)

			return saif->master_id;

		ret = of_alias_get_id(master, "saif");

		if (ret < 0)

			return ret;

		else

			saif->master_id = ret;

	}



	if (saif->master_id < 0 || saif->master_id >= ARRAY_SIZE(mxs_saif)) {

	if (saif->master_id >= ARRAY_SIZE(mxs_saif)) {

		dev_err(&pdev->dev, "get wrong master id\n");

		return -EINVAL;

	}