Well one of them anyway - not yet sure why the other fails
Signed-off-by: Alan Cox <[email protected]>
---
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 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;