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>

diff --git a/drivers/staging/gma500/psb_2d.c b/drivers/staging/gma500/psb_2d.c
index 94bce5c0648eea03decdec44d777cf598738f6ae..29959ded78fc118fa8ba7ebe3a24b94201c4196e 100644 (file)
--- 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 6499f28cb2af7258e6adf571fab64bb314113f37..665096f6a84356f522f7371bb833952a1657faa5 100644 (file)
--- 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;