| From 648ccc7d35e3416fdc739d2e520e85de3125361b Mon Sep 17 00:00:00 2001 |
| From: Márton Németh <nm127@freemail.hu> |
| Date: Mon, 11 Jun 2012 19:09:25 +0200 |
| Subject: drm sis: initialize object_idr |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Márton Németh <nm127@freemail.hu> |
| |
| commit 648ccc7d35e3416fdc739d2e520e85de3125361b upstream. |
| |
| 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> |
| Signed-off-by: Dave Airlie <airlied@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/sis/sis_drv.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- 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_de |
| 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; |
| } |