---

yaml
---
r: 144639
b: refs/heads/master
c: 3788f48
h: refs/heads/master
i:
  144637: 23775be
  144635: 50580d4
  144631: f5b2bca
  144623: 27eded8
  144607: 075269d
  144575: 5cac01f
  144511: cd2d8bf
  144383: 85b894e
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30ddbd94401a132f4d932775d1902b3c9a8c41b5
+refs/heads/master: 3788f48a0fad246dbab826e8b2f07b403b0e3279

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: