Commit 922b072e authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] fbdev compat_ioctl warning fix

Fix some confusion over fbdev compat_ioctl return types - compat_ioctls return
`long'.
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 089d5f72
...@@ -876,7 +876,8 @@ fb_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ...@@ -876,7 +876,8 @@ fb_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
int fbidx = iminor(file->f_dentry->d_inode); int fbidx = iminor(file->f_dentry->d_inode);
struct fb_info *info = registered_fb[fbidx]; struct fb_info *info = registered_fb[fbidx];
struct fb_ops *fb = info->fbops; struct fb_ops *fb = info->fbops;
int ret; long ret;
if (fb->fb_compat_ioctl == NULL) if (fb->fb_compat_ioctl == NULL)
return -ENOIOCTLCMD; return -ENOIOCTLCMD;
lock_kernel(); lock_kernel();
......
...@@ -585,7 +585,7 @@ struct fb_ops { ...@@ -585,7 +585,7 @@ struct fb_ops {
unsigned long arg, struct fb_info *info); unsigned long arg, struct fb_info *info);
/* Handle 32bit compat ioctl (optional) */ /* Handle 32bit compat ioctl (optional) */
int (*fb_compat_ioctl)(struct file *f, unsigned cmd, unsigned long arg, long (*fb_compat_ioctl)(struct file *f, unsigned cmd, unsigned long arg,
struct fb_info *info); struct fb_info *info);
/* perform fb specific mmap */ /* perform fb specific mmap */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment