diff options
author | Thomas Hellstrom <unichrome@shipmail.org> | 2005-08-14 09:52:09 +0000 |
---|---|---|
committer | Thomas Hellstrom <unichrome@shipmail.org> | 2005-08-14 09:52:09 +0000 |
commit | 4f5961eeeee806a2d6e08e159c56262d4f060cba (patch) | |
tree | e5e70f2900f9cb441ad16eca442bc616018595e8 /shared/via_video.c | |
parent | 4050f5066a706bda74ed93ab858bbc9fc0b1477b (diff) |
VIA bugvixes by Joris van Rantwijk Initial commit.
Diffstat (limited to 'shared/via_video.c')
-rw-r--r-- | shared/via_video.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/shared/via_video.c b/shared/via_video.c index 289ddac1..d79ee028 100644 --- a/shared/via_video.c +++ b/shared/via_video.c @@ -54,6 +54,9 @@ via_release_futex(drm_via_private_t *dev_priv, int context) unsigned int i; volatile int *lock; + if (!dev_priv->sarea_priv) + return; + for (i=0; i < VIA_NR_XVMC_LOCKS; ++i) { lock = (int *) XVMCLOCKPTR(dev_priv->sarea_priv, i); if ( (_DRM_LOCKING_CONTEXT( *lock ) == context)) { @@ -77,7 +80,8 @@ via_decoder_futex(DRM_IOCTL_ARGS) DRM_DEBUG("%s\n", __FUNCTION__); - DRM_COPY_FROM_USER_IOCTL(fx, (drm_via_futex_t *) data, sizeof(fx)); + DRM_COPY_FROM_USER_IOCTL(fx, (drm_via_futex_t __user *) data, + sizeof(fx)); if (fx.lock > VIA_NR_XVMC_LOCKS) return -EFAULT; |