From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?B?TsOpbWV0aCBNw6FydG9u?= Subject: [PATCH] drm sis: initialize object_idr Date: Mon, 11 Jun 2012 19:09:25 +0200 Message-ID: <4FD62645.6090501@freemail.hu> References: <4FD5142B.2080809@freemail.hu> <20120611071713.GA4695@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <20120611071713.GA4695@phenom.ffwll.local> Sender: linux-kernel-owner@vger.kernel.org To: David Airlie , Dave Airlie , Daniel Vetter , Paul Gortmaker , Jesper Juhl , Arjan van de Ven , dri-devel@lists.freedesktop.org Cc: LKML List-Id: dri-devel@lists.freedesktop.org =46rom: M=C3=A1rton N=C3=A9meth The filed object_idr of struct drm_sis_private was introduced with commit http://git.kernel.org/?p=3Dlinux/kernel/git/torvalds/linux.git;a= =3Dcommitdiff;h=3D6de8a748881f1cd9d795454da2b6db616d5ca3d7 . 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=C3=A1rton N=C3=A9meth Cc: Daniel Vetter --- diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_dr= v.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, un= signed long chipset) if (dev_priv =3D=3D NULL) return -ENOMEM; + idr_init(&dev_priv->object_idr); dev->dev_private =3D (void *)dev_priv; dev_priv->chipset =3D chipset; - idr_init(&dev->object_name_idr); return 0; }