summaryrefslogtreecommitdiff
path: root/drivers/gpu
diff options
context:
space:
mode:
authorJesper Juhl <jj@chaosbits.net>2012-01-14 21:20:37 +0100
committerDave Airlie <airlied@redhat.com>2012-01-23 11:00:47 +0000
commit4e087a7a1f3884750790bda580e22e9eccd5f4fa (patch)
treed9e4b549a79023450f6fb429738f6c6ba1589187 /drivers/gpu
parentdcd6c92267155e70a94b3927bce681ce74b80d1f (diff)
downloadlinux-3.10-4e087a7a1f3884750790bda580e22e9eccd5f4fa.tar.gz
linux-3.10-4e087a7a1f3884750790bda580e22e9eccd5f4fa.tar.bz2
linux-3.10-4e087a7a1f3884750790bda580e22e9eccd5f4fa.zip
gpu, drm, sis: Don't return uninitialized variable from sis_driver_load()
In sis_driver_load(), the only use of 'ret' is as the return value from the function, unfortunately it is never initialized, so the function just returns garbage when it succeeds. To fix that, remove the variable and just return 0 directly on success. Signed-off-by: Jesper Juhl <jj@chaosbits.net> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/sis/sis_drv.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c
index 06da063ece2..573220cc526 100644
--- a/drivers/gpu/drm/sis/sis_drv.c
+++ b/drivers/gpu/drm/sis/sis_drv.c
@@ -40,7 +40,6 @@ static struct pci_device_id pciidlist[] = {
static int sis_driver_load(struct drm_device *dev, unsigned long chipset)
{
drm_sis_private_t *dev_priv;
- int ret;
dev_priv = kzalloc(sizeof(drm_sis_private_t), GFP_KERNEL);
if (dev_priv == NULL)
@@ -50,7 +49,7 @@ static int sis_driver_load(struct drm_device *dev, unsigned long chipset)
dev_priv->chipset = chipset;
idr_init(&dev->object_name_idr);
- return ret;
+ return 0;
}
static int sis_driver_unload(struct drm_device *dev)