aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/sbuslib.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/sbuslib.c')
-rw-r--r--drivers/video/sbuslib.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/drivers/video/sbuslib.c b/drivers/video/sbuslib.c
index 3a74a63dd4f2..55e6e2d60d3a 100644
--- a/drivers/video/sbuslib.c
+++ b/drivers/video/sbuslib.c
@@ -216,10 +216,10 @@ static int fbiogetputcmap(struct file *file, struct fb_info *info,
216 ret |= put_user(compat_ptr(addr), &p->blue); 216 ret |= put_user(compat_ptr(addr), &p->blue);
217 if (ret) 217 if (ret)
218 return -EFAULT; 218 return -EFAULT;
219 return info->fbops->fb_ioctl(file->f_dentry->d_inode, file, 219 return info->fbops->fb_ioctl(info,
220 (cmd == FBIOPUTCMAP32) ? 220 (cmd == FBIOPUTCMAP32) ?
221 FBIOPUTCMAP_SPARC : FBIOGETCMAP_SPARC, 221 FBIOPUTCMAP_SPARC : FBIOGETCMAP_SPARC,
222 (unsigned long)p, info); 222 (unsigned long)p);
223} 223}
224 224
225struct fbcursor32 { 225struct fbcursor32 {
@@ -260,12 +260,11 @@ static int fbiogscursor(struct file *file, struct fb_info *info,
260 ret |= put_user(compat_ptr(addr), &p->image); 260 ret |= put_user(compat_ptr(addr), &p->image);
261 if (ret) 261 if (ret)
262 return -EFAULT; 262 return -EFAULT;
263 return info->fbops->fb_ioctl(file->f_dentry->d_inode, file, 263 return info->fbops->fb_ioctl(info, FBIOSCURSOR, (unsigned long)p);
264 FBIOSCURSOR, (unsigned long)p, info);
265} 264}
266 265
267long sbusfb_compat_ioctl(struct file *file, unsigned int cmd, 266long sbusfb_compat_ioctl(struct fb_info *info, unsigned int cmd,
268 unsigned long arg, struct fb_info *info) 267 unsigned long arg)
269{ 268{
270 switch (cmd) { 269 switch (cmd) {
271 case FBIOGTYPE: 270 case FBIOGTYPE:
@@ -278,14 +277,13 @@ long sbusfb_compat_ioctl(struct file *file, unsigned int cmd,
278 case FBIOSCURPOS: 277 case FBIOSCURPOS:
279 case FBIOGCURPOS: 278 case FBIOGCURPOS:
280 case FBIOGCURMAX: 279 case FBIOGCURMAX:
281 return info->fbops->fb_ioctl(file->f_dentry->d_inode, 280 return info->fbops->fb_ioctl(info, cmd, arg);
282 file, cmd, arg, info);
283 case FBIOPUTCMAP32: 281 case FBIOPUTCMAP32:
284 return fbiogetputcmap(file, info, cmd, arg); 282 return fbiogetputcmap(info, cmd, arg);
285 case FBIOGETCMAP32: 283 case FBIOGETCMAP32:
286 return fbiogetputcmap(file, info, cmd, arg); 284 return fbiogetputcmap(info, cmd, arg);
287 case FBIOSCURSOR32: 285 case FBIOSCURSOR32:
288 return fbiogscursor(file, info, arg); 286 return fbiogscursor(info, arg);
289 default: 287 default:
290 return -ENOIOCTLCMD; 288 return -ENOIOCTLCMD;
291 } 289 }