From e2c767faacf047e614f9d3e627ecc2a79983f15b Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 2 Mar 2009 10:37:44 +1000 Subject: [PATCH] --- yaml --- r: 144639 b: refs/heads/master c: 3788f48a0fad246dbab826e8b2f07b403b0e3279 h: refs/heads/master i: 144637: 23775be43ef127f8895841a5a7115a76c6842580 144635: 50580d429dd3cfbaa65e4e91c1516d11195d7e30 144631: f5b2bcaf0e65e692a2c7d88bbcd8d29700ee5d62 144623: 27eded88ff12e4c3b0a5beb1136e078a7d50307e 144607: 075269d47ca6a5c15f7f2bc1a3f2e737d7d251a2 144575: 5cac01f638025618f4286caac9c7c17978acd40d 144511: cd2d8bf02527805e7bba7d680577d9e63d023191 144383: 85b894e61d62b017100eef1f16958a65824074c2 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_stub.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7fec13f41130..c82457ca9aa0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30ddbd94401a132f4d932775d1902b3c9a8c41b5 +refs/heads/master: 3788f48a0fad246dbab826e8b2f07b403b0e3279 diff --git a/trunk/drivers/gpu/drm/drm_stub.c b/trunk/drivers/gpu/drm/drm_stub.c index e8c2fd4c5e65..b9631e3a1ea6 100644 --- a/trunk/drivers/gpu/drm/drm_stub.c +++ b/trunk/drivers/gpu/drm/drm_stub.c @@ -402,14 +402,14 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, if (dev->driver->load) { ret = dev->driver->load(dev, ent->driver_data); if (ret) - goto err_g3; + goto err_g4; } /* setup the grouping for the legacy output */ if (drm_core_check_feature(dev, DRIVER_MODESET)) { ret = drm_mode_group_init_legacy_group(dev, &dev->primary->mode_group); if (ret) - goto err_g3; + goto err_g4; } list_add_tail(&dev->driver_item, &driver->device_list); @@ -420,8 +420,11 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, return 0; -err_g3: +err_g4: drm_put_minor(&dev->primary); +err_g3: + if (drm_core_check_feature(dev, DRIVER_MODESET)) + drm_put_minor(&dev->control); err_g2: pci_disable_device(pdev); err_g1: