From cb048d558690ba1468e6bb26b82594b4330fb21c Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Fri, 1 Apr 2011 22:24:15 +0100 Subject: [PATCH] staging: gma500: enable the 2D op stuff Well one of them anyway - not yet sure why the other fails Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman --- drivers/staging/gma500/psb_2d.c | 2 +- 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 94bce5c0648..29959ded78f 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 6499f28cb2a..665096f6a84 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; -- 2.11.4.GIT