diff options
author | Alan Cox <alan@linux.jf.intel.com> | 2011-04-01 21:24:15 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-05 18:41:12 (GMT) |
commit | cb048d558690ba1468e6bb26b82594b4330fb21c (patch) | |
tree | 9144d34cd981af034c6432142b50c36fa89b66e0 | |
parent | 636fa5c78c73901022ed6c20c50543af8811e050 (diff) | |
download | linux-cb048d558690ba1468e6bb26b82594b4330fb21c.tar.xz |
staging: gma500: enable the 2D op stuff
Well one of them anyway - not yet sure why the other fails
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/gma500/psb_2d.c | 2 | ||||
-rw-r--r-- | drivers/staging/gma500/psb_fb.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/gma500/psb_2d.c b/drivers/staging/gma500/psb_2d.c index 94bce5c..29959de 100644 --- a/drivers/staging/gma500/psb_2d.c +++ b/drivers/staging/gma500/psb_2d.c @@ -343,7 +343,7 @@ void psbfb_copyarea(struct fb_info *info, if (unlikely(info->state != FBINFO_STATE_RUNNING)) return; - if (1 || (info->flags & FBINFO_HWACCEL_DISABLED)) + if (info->flags & FBINFO_HWACCEL_DISABLED) return cfb_copyarea(info, region); /* psb_check_power_state(dev, PSB_DEVICE_SGX); */ diff --git a/drivers/staging/gma500/psb_fb.c b/drivers/staging/gma500/psb_fb.c index 6499f28..665096f 100644 --- a/drivers/staging/gma500/psb_fb.c +++ b/drivers/staging/gma500/psb_fb.c @@ -287,7 +287,7 @@ static int psbfb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg return -EFAULT; if (l > 32) return -EMSGSIZE; - if (copy_from_user(buf, p + 1, l)) + if (copy_from_user(buf, p + 1, l * sizeof(u32))) return -EFAULT; psbfb_2d_submit(dev_priv, buf, l); return 0; |