aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSudip Jain <sudip.jain@linaro.org>2010-10-06 13:45:06 -0600
committerJohn Rigby <john.rigby@linaro.org>2010-10-06 13:51:04 -0600
commitd5a7aee06ee68cfc07f837f2d9ec57862cb9483f (patch)
treecaa8f9ca009d8d7a33899a9dcf5b314eb43ca506
parentd6af4c608223547b5e0ecfcacfbc4c2fa7b3a5ae (diff)
downloadlinux-2.6.34-ux500-d5a7aee06ee68cfc07f837f2d9ec57862cb9483f.tar.gz
U8500_MOP: Disable FBIOGETCMAP and FBIOPUTCMAP in fbmem.cHEADmaster
Signed-off-by: John Rigby <john.rigby@linaro.org>
-rw-r--r--drivers/video/fbmem.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index a15b44e..cbbe449 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1072,6 +1072,10 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
ret = copy_to_user(argp, &fix, sizeof(fix)) ? -EFAULT : 0;
break;
case FBIOPUTCMAP:
+#if defined(CONFIG_MACH_U8500_MOP)
+ ret = EPERM;
+ break;
+#endif
if (copy_from_user(&cmap, argp, sizeof(cmap)))
return -EFAULT;
ret = fb_set_user_cmap(&cmap, info);
@@ -1306,6 +1310,10 @@ static long fb_compat_ioctl(struct file *file, unsigned int cmd,
case FBIOGETCMAP:
case FBIOPUTCMAP:
+#if defined(CONFIG_MACH_U8500_MOP)
+ ret = EPERM;
+ break;
+#endif
ret = fb_getput_cmap(info, cmd, arg);
break;