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

Commit 61765a50 authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by Mauro Carvalho Chehab
Browse files

[media] si470x: fixup wait_for_completion_timeout return handling 



return type of wait_for_completion_timeout is unsigned long not int. A
appropriately named variable of type unsigned long is added and the
assignments fixed up.

Signed-off-by: default avatarNicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent b6cca54f

drivers/media/radio/si470x/radio-si470x-common.c

+8 −6
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ static int si470x_set_band(struct si470x_device *radio, int band) 
static int si470x_set_chan(struct si470x_device *radio, unsigned short chan)

{

	int retval;

	unsigned long time_left;

	bool timed_out = false;



	/* start tuning */
@@ -219,9 +220,9 @@ static int si470x_set_chan(struct si470x_device *radio, unsigned short chan) 


	/* wait till tune operation has completed */

	reinit_completion(&radio->completion);

	retval = wait_for_completion_timeout(&radio->completion,

	time_left = wait_for_completion_timeout(&radio->completion,

						msecs_to_jiffies(tune_timeout));

	if (!retval)

	if (time_left == 0)

		timed_out = true;



	if ((radio->registers[STATUSRSSI] & STATUSRSSI_STC) == 0)
@@ -301,6 +302,7 @@ static int si470x_set_seek(struct si470x_device *radio, 
	int band, retval;

	unsigned int freq;

	bool timed_out = false;

	unsigned long time_left;



	/* set band */

	if (seek->rangelow || seek->rangehigh) {
@@ -342,9 +344,9 @@ static int si470x_set_seek(struct si470x_device *radio, 


	/* wait till tune operation has completed */

	reinit_completion(&radio->completion);

	retval = wait_for_completion_timeout(&radio->completion,

	time_left = wait_for_completion_timeout(&radio->completion,

						msecs_to_jiffies(seek_timeout));

	if (!retval)

	if (time_left == 0)

		timed_out = true;



	if ((radio->registers[STATUSRSSI] & STATUSRSSI_STC) == 0)