git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
drivers
/
video
/
fbmem.c
diff --git
a/drivers/video/fbmem.c
b/drivers/video/fbmem.c
index
4ac1201
..
e2bf953
100644
(file)
--- a/
drivers/video/fbmem.c
+++ b/
drivers/video/fbmem.c
@@
-1036,11
+1036,11
@@
static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
return -EFAULT;
if (!lock_fb_info(info))
return -ENODEV;
return -EFAULT;
if (!lock_fb_info(info))
return -ENODEV;
-
acquire_console_sem
();
+
console_lock
();
info->flags |= FBINFO_MISC_USEREVENT;
ret = fb_set_var(info, &var);
info->flags &= ~FBINFO_MISC_USEREVENT;
info->flags |= FBINFO_MISC_USEREVENT;
ret = fb_set_var(info, &var);
info->flags &= ~FBINFO_MISC_USEREVENT;
-
release_console_sem
();
+
console_unlock
();
unlock_fb_info(info);
if (!ret && copy_to_user(argp, &var, sizeof(var)))
ret = -EFAULT;
unlock_fb_info(info);
if (!ret && copy_to_user(argp, &var, sizeof(var)))
ret = -EFAULT;
@@
-1072,9
+1072,9
@@
static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
return -EFAULT;
if (!lock_fb_info(info))
return -ENODEV;
return -EFAULT;
if (!lock_fb_info(info))
return -ENODEV;
-
acquire_console_sem
();
+
console_lock
();
ret = fb_pan_display(info, &var);
ret = fb_pan_display(info, &var);
-
release_console_sem
();
+
console_unlock
();
unlock_fb_info(info);
if (ret == 0 && copy_to_user(argp, &var, sizeof(var)))
return -EFAULT;
unlock_fb_info(info);
if (ret == 0 && copy_to_user(argp, &var, sizeof(var)))
return -EFAULT;
@@
-1119,11
+1119,11
@@
static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
case FBIOBLANK:
if (!lock_fb_info(info))
return -ENODEV;
case FBIOBLANK:
if (!lock_fb_info(info))
return -ENODEV;
-
acquire_console_sem
();
+
console_lock
();
info->flags |= FBINFO_MISC_USEREVENT;
ret = fb_blank(info, arg);
info->flags &= ~FBINFO_MISC_USEREVENT;
info->flags |= FBINFO_MISC_USEREVENT;
ret = fb_blank(info, arg);
info->flags &= ~FBINFO_MISC_USEREVENT;
-
release_console_sem
();
+
console_unlock
();
unlock_fb_info(info);
break;
default:
unlock_fb_info(info);
break;
default: