[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: Nicholas Mc Guire <hofrat@osadl.org> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
parent
b6cca54fc8
commit
61765a5032
|
@ -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,
|
||||
msecs_to_jiffies(tune_timeout));
|
||||
if (!retval)
|
||||
time_left = wait_for_completion_timeout(&radio->completion,
|
||||
msecs_to_jiffies(tune_timeout));
|
||||
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,
|
||||
msecs_to_jiffies(seek_timeout));
|
||||
if (!retval)
|
||||
time_left = wait_for_completion_timeout(&radio->completion,
|
||||
msecs_to_jiffies(seek_timeout));
|
||||
if (time_left == 0)
|
||||
timed_out = true;
|
||||
|
||||
if ((radio->registers[STATUSRSSI] & STATUSRSSI_STC) == 0)
|
||||
|
|
Loading…
Reference in a new issue