From 808b91f63d6579eef88a565590a9e533be4502f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20N=C3=A9meth?= Date: Mon, 11 Jun 2012 19:09:25 +0200 Subject: [PATCH] --- yaml --- r: 311027 b: refs/heads/master c: 648ccc7d35e3416fdc739d2e520e85de3125361b h: refs/heads/master i: 311025: 8afcbc3940292bc1e0a79f62495d8e20bea174ab 311023: 5013b92f47ec77e36d1882126522ca0d7f00f347 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/sis/sis_drv.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 512193d25cf6..fadf6bbe579d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce020ea53264f1460ae619cfc12f968dbd0b8974 +refs/heads/master: 648ccc7d35e3416fdc739d2e520e85de3125361b diff --git a/trunk/drivers/gpu/drm/sis/sis_drv.c b/trunk/drivers/gpu/drm/sis/sis_drv.c index 30d98d14b5c5..dd14cd1a0033 100644 --- a/trunk/drivers/gpu/drm/sis/sis_drv.c +++ b/trunk/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; }