diff options
| author | Alan Cox | 2011-04-01 23:24:15 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-04-05 20:41:12 +0200 |
| commit | cb048d558690ba1468e6bb26b82594b4330fb21c (patch) | |
| tree | 9144d34cd981af034c6432142b50c36fa89b66e0 /drivers/staging/gma500 | |
| parent | staging: gma500: psb_reset actually holds lid functions (diff) | |
| download | kernel-qcow2-linux-cb048d558690ba1468e6bb26b82594b4330fb21c.tar.gz kernel-qcow2-linux-cb048d558690ba1468e6bb26b82594b4330fb21c.tar.xz kernel-qcow2-linux-cb048d558690ba1468e6bb26b82594b4330fb21c.zip | |
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>
Diffstat (limited to 'drivers/staging/gma500')
| -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 94bce5c0648e..29959ded78fc 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 6499f28cb2af..665096f6a843 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; |