From 08bec7e9db5e48ff463ec8e5864a692ee46c8aa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20N=C3=A9meth?= Date: Sun, 10 Jun 2012 23:39:55 +0200 Subject: [PATCH] --- yaml --- r: 311026 b: refs/heads/master c: ce020ea53264f1460ae619cfc12f968dbd0b8974 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/via/via_map.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 015577200c0a..512193d25cf6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 489797d510dfbce15120492d7ef6f956928b99f2 +refs/heads/master: ce020ea53264f1460ae619cfc12f968dbd0b8974 diff --git a/trunk/drivers/gpu/drm/via/via_map.c b/trunk/drivers/gpu/drm/via/via_map.c index 1f182254e81e..c126182ac07e 100644 --- a/trunk/drivers/gpu/drm/via/via_map.c +++ b/trunk/drivers/gpu/drm/via/via_map.c @@ -100,12 +100,11 @@ int via_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); - pci_set_master(dev->pdev); ret = drm_vblank_init(dev, 1);