Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

drm: cleanup properly in drm_get_dev() failure paths

Browse source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Ben Skeggs 2009-03-02 10:37:44 +10:00 committed by Dave Airlie
parent 30ddbd9440
commit 3788f48a0f
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/gpu/drm/drm_stub.c
View file

@ -402,14 +402,14 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
if (dev->driver->load) { if (dev->driver->load) {
ret = dev->driver->load(dev, ent->driver_data); ret = dev->driver->load(dev, ent->driver_data);
if (ret) if (ret)
goto err_g3; goto err_g4;
} }
/* setup the grouping for the legacy output */ /* setup the grouping for the legacy output */
if (drm_core_check_feature(dev, DRIVER_MODESET)) { if (drm_core_check_feature(dev, DRIVER_MODESET)) {
ret = drm_mode_group_init_legacy_group(dev, &dev->primary->mode_group); ret = drm_mode_group_init_legacy_group(dev, &dev->primary->mode_group);
if (ret) if (ret)
goto err_g3; goto err_g4;
} }
list_add_tail(&dev->driver_item, &driver->device_list); 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; return 0;
err_g3: err_g4:
drm_put_minor(&dev->primary); drm_put_minor(&dev->primary);
err_g3:
if (drm_core_check_feature(dev, DRIVER_MODESET))
drm_put_minor(&dev->control);
err_g2: err_g2:
pci_disable_device(pdev); pci_disable_device(pdev);
err_g1: err_g1: