summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/sis
diff options
context:
space:
mode:
authorMárton Németh <nm127@freemail.hu>2012-06-11 19:09:25 +0200
committerDave Airlie <airlied@redhat.com>2012-06-16 11:18:53 +0100
commit648ccc7d35e3416fdc739d2e520e85de3125361b (patch)
tree2e01668b72e8587662d8cf3c80145db571ddf6e1 /drivers/gpu/drm/sis
parentce020ea53264f1460ae619cfc12f968dbd0b8974 (diff)
downloadop-kernel-dev-648ccc7d35e3416fdc739d2e520e85de3125361b.zip
op-kernel-dev-648ccc7d35e3416fdc739d2e520e85de3125361b.tar.gz
drm sis: initialize object_idr
The filed object_idr of struct drm_sis_private was introduced with commit http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commitdiff;h=6de8a748881f1cd9d795454da2b6db616d5ca3d7 . The idr_init(&dev->object_name_idr) is called instead of idr_init(&dev_priv->object_idr) by mistake, leaving object_idr uninitialized. Correct this. This patch was not tested because of lack of hardware. Signed-off-by: Márton Németh <nm127@freemail.hu> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: stable@vger.kernel.org Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/sis')
-rw-r--r--drivers/gpu/drm/sis/sis_drv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c
index 30d98d1..dd14cd1 100644
--- a/drivers/gpu/drm/sis/sis_drv.c
+++ b/drivers/gpu/drm/sis/sis_drv.c
@@ -47,9 +47,9 @@ static int sis_driver_load(struct drm_device *dev, unsigned long chipset)
if (dev_priv == NULL)
return -ENOMEM;
+ idr_init(&dev_priv->object_idr);
dev->dev_private = (void *)dev_priv;
dev_priv->chipset = chipset;
- idr_init(&dev->object_name_idr);
return 0;
}
OpenPOWER on IntegriCloud