On 29/01/15 12:24, Nicholas Mc Guire wrote: > 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.h...@hofr.at> > --- > > v2: fixed subject line > v3: fixed patch description as recommended by Dan Carpenter > <dan.carpen...@oracle.com> > > Patch was compile tested only for x86_64_defconfig + CONFIG_X86_VSMP=y > CONFIG_HYPERV=m, CONFIG_FB_HYPERV=m > > Patch is against 3.19.0-rc5 -next-20150123 > > drivers/video/fbdev/hyperv_fb.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c > index 4254336..807ee22 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)); >
Thanks, queued for 4.1. Tomi
signature.asc
Description: OpenPGP digital signature
