[media] si470x: fixup wait_for_completion_timeout return handling
authorNicholas Mc Guire <hofrat@osadl.org>
Wed, 11 Feb 2015 14:20:54 +0000 (11:20 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Mon, 2 Mar 2015 17:55:44 +0000 (14:55 -0300)
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>
drivers/media/radio/si470x/radio-si470x-common.c

index 909c3f92d83920de0561d9dc59aa31171826d973..1d827adab7ebbbbf2ef9ed873fa55494344e4aa5 100644 (file)
@@ -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)