diff options
| author | Andrew Morton <akpm@osdl.org> | 2005-03-09 17:08:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-09 17:08:48 -0800 |
| commit | 922b072ee97aa79285920ab2eb412a039dbd1206 (patch) | |
| tree | d95b28106eb24c98a8e9cb4b4b6cadc71c1977db | |
| parent | 089d5f720f0645d44762134e985e9e9b505ca410 (diff) | |
[PATCH] fbdev compat_ioctl warning fix
Fix some confusion over fbdev compat_ioctl return types - compat_ioctls return
`long'.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/video/fbmem.c | 3 | ||||
| -rw-r--r-- | include/linux/fb.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index 92f4a9781d58..0f7808749082 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c @@ -876,7 +876,8 @@ fb_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) int fbidx = iminor(file->f_dentry->d_inode); struct fb_info *info = registered_fb[fbidx]; struct fb_ops *fb = info->fbops; - int ret; + long ret; + if (fb->fb_compat_ioctl == NULL) return -ENOIOCTLCMD; lock_kernel(); diff --git a/include/linux/fb.h b/include/linux/fb.h index 974894b623cd..0e9789ed0003 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -585,7 +585,7 @@ struct fb_ops { unsigned long arg, struct fb_info *info); /* 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); /* perform fb specific mmap */ |