summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Mc Guire <der.herr@hofr.at>2015-02-27 11:26:03 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-01 19:30:08 -0800
commitb057b3ad16e1c6e21e234cd7f5c61c525da97f17 (patch)
tree41967f5fd99205de43ec40cff26f9f3d0d6696f6
parent51e5181d20086c0b26e871deffeff3ff47cf5c4b (diff)
downloadtalos-op-linux-b057b3ad16e1c6e21e234cd7f5c61c525da97f17.tar.gz
talos-op-linux-b057b3ad16e1c6e21e234cd7f5c61c525da97f17.zip
hv: hv_balloon: match var type to return type of wait_for_completion
return type of wait_for_completion_timeout is unsigned long not int, this patch changes the type of t from int to unsigned long. Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at> Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/hv/hv_balloon.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
index ff169386b2c7..965c37aab277 100644
--- a/drivers/hv/hv_balloon.c
+++ b/drivers/hv/hv_balloon.c
@@ -1414,7 +1414,8 @@ static void balloon_onchannelcallback(void *context)
static int balloon_probe(struct hv_device *dev,
const struct hv_vmbus_device_id *dev_id)
{
- int ret, t;
+ int ret;
+ unsigned long t;
struct dm_version_request version_req;
struct dm_capabilities cap_msg;
OpenPOWER on IntegriCloud