summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorNicholas Mc Guire <der.herr@hofr.at>2015-01-29 11:24:16 +0100
committerTomi Valkeinen <tomi.valkeinen@ti.com>2015-03-10 14:37:46 +0200
commit7dea97e0379dbb2983a9f009c7cdaeb6bbe4c98e (patch)
treefa41a66de217928d09cca6677628a8b437093f6f /drivers/video
parent17713ce09d95fa79a1bf8f8604ecea9c6e1924aa (diff)
hyperv: hyperv_fb: match wait_for_completion_timeout return type
The return type of wait_for_completion_timeout is unsigned long not int. This patch fixes up the declarations only. Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at> Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/hyperv_fb.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
index 42543362f163..807ee22ef229 100644
--- a/drivers/video/fbdev/hyperv_fb.c
+++ b/drivers/video/fbdev/hyperv_fb.c
@@ -415,7 +415,8 @@ static int synthvid_negotiate_ver(struct hv_device *hdev, u32 ver)
struct fb_info *info = hv_get_drvdata(hdev);
struct hvfb_par *par = info->par;
struct synthvid_msg *msg = (struct synthvid_msg *)par->init_buf;
- int t, ret = 0;
+ int ret = 0;
+ unsigned long t;
memset(msg, 0, sizeof(struct synthvid_msg));
msg->vid_hdr.type = SYNTHVID_VERSION_REQUEST;
@@ -488,7 +489,8 @@ static int synthvid_send_config(struct hv_device *hdev)
struct fb_info *info = hv_get_drvdata(hdev);
struct hvfb_par *par = info->par;
struct synthvid_msg *msg = (struct synthvid_msg *)par->init_buf;
- int t, ret = 0;
+ int ret = 0;
+ unsigned long t;
/* Send VRAM location */
memset(msg, 0, sizeof(struct synthvid_msg));