With the introduction of capabilities, the PCuABI expects a capability when dealing with the user pointers.
Address a compilation warning triggered by otherwise implicit conversion that might lead to unexpected behaviour when operating on capabilities.
Signed-off-by: Vincenzo Frascino vincenzo.frascino@arm.com --- drivers/video/fbdev/core/fbmem.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c index 5ac14a08f624..96769e01b4ee 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -1296,6 +1296,7 @@ static long fb_compat_ioctl(struct file *file, unsigned int cmd, struct fb_info *info = file_fb_info(file); const struct fb_ops *fb; long ret = -ENOIOCTLCMD; + user_uintptr_t argp;
if (!info) return -ENODEV; @@ -1306,8 +1307,10 @@ static long fb_compat_ioctl(struct file *file, unsigned int cmd, case FBIOPAN_DISPLAY: case FBIOGET_CON2FBMAP: case FBIOPUT_CON2FBMAP: - arg = (unsigned long) compat_ptr(arg); - fallthrough; + argp = (user_uintptr_t) compat_ptr(arg); + ret = do_fb_ioctl(info, cmd, argp); + break; + case FBIOBLANK: ret = do_fb_ioctl(info, cmd, arg); break;