From 50aaeb08f5029c34c9ee5e49c993d3d69ad8cedc Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Sun, 8 Jan 2012 22:42:27 +0100 Subject: [PATCH] --- yaml --- r: 282741 b: refs/heads/master c: b5215ef1a877cd81a2558f3ddbcf784671a27588 h: refs/heads/master i: 282739: 56288b95a247b2d6076bd43ecae3e747f54748e7 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/sis/sis_mm.c | 3 +-- trunk/drivers/gpu/drm/via/via_mm.c | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 51d920c301fc..164ad88b4c1f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0afb5d443748ee91a34e3a13cb454b0047be9ec +refs/heads/master: b5215ef1a877cd81a2558f3ddbcf784671a27588 diff --git a/trunk/drivers/gpu/drm/sis/sis_mm.c b/trunk/drivers/gpu/drm/sis/sis_mm.c index 46cb2bce6cc5..dd4a316c3d74 100644 --- a/trunk/drivers/gpu/drm/sis/sis_mm.c +++ b/trunk/drivers/gpu/drm/sis/sis_mm.c @@ -172,7 +172,6 @@ static int sis_drm_free(struct drm_device *dev, void *data, struct drm_file *fil drm_sis_private_t *dev_priv = dev->dev_private; drm_sis_mem_t *mem = data; struct sis_memblock *obj; - int ret; mutex_lock(&dev->struct_mutex); obj = idr_find(&dev_priv->object_idr, mem->free); @@ -193,7 +192,7 @@ static int sis_drm_free(struct drm_device *dev, void *data, struct drm_file *fil mutex_unlock(&dev->struct_mutex); DRM_DEBUG("free = 0x%lx\n", mem->free); - return ret; + return 0; } static int sis_fb_alloc(struct drm_device *dev, void *data, diff --git a/trunk/drivers/gpu/drm/via/via_mm.c b/trunk/drivers/gpu/drm/via/via_mm.c index bedb23d2ece0..a3574d09a07d 100644 --- a/trunk/drivers/gpu/drm/via/via_mm.c +++ b/trunk/drivers/gpu/drm/via/via_mm.c @@ -189,7 +189,6 @@ int via_mem_free(struct drm_device *dev, void *data, struct drm_file *file_priv) drm_via_private_t *dev_priv = dev->dev_private; drm_via_mem_t *mem = data; struct via_memblock *obj; - int ret; mutex_lock(&dev->struct_mutex); obj = idr_find(&dev_priv->object_idr, mem->index); @@ -206,7 +205,7 @@ int via_mem_free(struct drm_device *dev, void *data, struct drm_file *file_priv) DRM_DEBUG("free = 0x%lx\n", mem->index); - return ret; + return 0; }