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

Commit bd85d189 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus

parents 5bf3db18 ef30da1c

sound/soc/sh/rcar/core.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -363,8 +363,6 @@ struct rsnd_mod *rsnd_mod_next(int *iterator, 
		if (!mod)

		if (!mod)

			continue;

			continue;





		(*iterator)++;



		return mod;

		return mod;

	}

	}

sound/soc/sh/rcar/rsnd.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -374,10 +374,10 @@ struct rsnd_mod *rsnd_mod_next(int *iterator, 
			       int array_size);

			       int array_size);

#define for_each_rsnd_mod(iterator, pos, io)				\

#define for_each_rsnd_mod(iterator, pos, io)				\

	for (iterator = 0;						\

	for (iterator = 0;						\

	     (pos = rsnd_mod_next(&iterator, io, NULL, 0));)

	     (pos = rsnd_mod_next(&iterator, io, NULL, 0)); iterator++)

#define for_each_rsnd_mod_arrays(iterator, pos, io, array, size)	\

#define for_each_rsnd_mod_arrays(iterator, pos, io, array, size)	\

	for (iterator = 0;						\

	for (iterator = 0;						\

	     (pos = rsnd_mod_next(&iterator, io, array, size));)

	     (pos = rsnd_mod_next(&iterator, io, array, size)); iterator++)

#define for_each_rsnd_mod_array(iterator, pos, io, array)		\

#define for_each_rsnd_mod_array(iterator, pos, io, array)		\

	for_each_rsnd_mod_arrays(iterator, pos, io, array, ARRAY_SIZE(array))

	for_each_rsnd_mod_arrays(iterator, pos, io, array, ARRAY_SIZE(array))

sound/soc/sh/rcar/src.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -390,6 +390,9 @@ static int rsnd_src_init(struct rsnd_mod *mod, 
{

{

	struct rsnd_src *src = rsnd_mod_to_src(mod);

	struct rsnd_src *src = rsnd_mod_to_src(mod);





	/* reset sync convert_rate */

	src->sync.val = 0;



	rsnd_mod_power_on(mod);

	rsnd_mod_power_on(mod);





	rsnd_src_activation(mod);

	rsnd_src_activation(mod);
@@ -398,9 +401,6 @@ static int rsnd_src_init(struct rsnd_mod *mod, 




	rsnd_src_status_clear(mod);

	rsnd_src_status_clear(mod);





	/* reset sync convert_rate */

	src->sync.val = 0;



	return 0;

	return 0;

}

}