diff options
| author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-10-25 09:24:45 +0200 |
|---|---|---|
| committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-10-25 09:24:45 +0200 |
| commit | 07706c9b79b88baff5f160351b482ccdf3315f0c (patch) | |
| tree | 0679ad42a802894aae3d535efdaf229d985b54bc /linux-core | |
| parent | 3d4b32e91647f61712d54a46f0a173deff46e6b4 (diff) | |
| parent | a70fe82baf0ca2be98e02680cff489f90b0ea3de (diff) | |
Merge branch 'master' into drm-ttm-finalize
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/sis_mm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linux-core/sis_mm.c b/linux-core/sis_mm.c index 7e162a8e..9222b08d 100644 --- a/linux-core/sis_mm.c +++ b/linux-core/sis_mm.c @@ -133,6 +133,7 @@ static int sis_drm_alloc(struct drm_device * dev, struct drm_file *file_priv, dev_priv->agp_initialized)) { DRM_ERROR ("Attempt to allocate from uninitialized memory manager.\n"); + mutex_unlock(&dev->struct_mutex); return -EINVAL; } |