drm/sis|via: don't return stack garbage from free_mem ioctl

Fallout from my "kill drm_sman" refactor. Unfortunately gcc seems to
have failed me and not warned about this.

Tested-by: Jakob Bornecrantz <wallbraker@gmail.com> (on via)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/drivers/gpu/drm/sis/sis_mm.c b/drivers/gpu/drm/sis/sis_mm.c
index 46cb2bce6cc582f1486a9f9544105bd9b636015a..dd4a316c3d746b974c462294817b0321c1629af2 100644 (file)
--- a/drivers/gpu/drm/sis/sis_mm.c
+++ b/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/drivers/gpu/drm/via/via_mm.c b/drivers/gpu/drm/via/via_mm.c
index bedb23d2ece083f265e3b152ab7a546cf66e4555..a3574d09a07d0c95066f3010a40998f048f728f8 100644 (file)
--- a/drivers/gpu/drm/via/via_mm.c
+++ b/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;
 }