mirror of
https://gitlab.freedesktop.org/mesa/drm.git
synced 2025-12-24 13:40:13 +01:00
worst merge effort ever
This commit is contained in:
parent
47b7ec71fe
commit
348d95e00b
1 changed files with 0 additions and 4 deletions
|
|
@ -355,10 +355,6 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
|
|||
if ((ret = dev->driver->load(dev, ent->driver_data)))
|
||||
goto err_g5;
|
||||
|
||||
if (dev->driver->load)
|
||||
if ((ret = dev->driver->load(dev, ent->driver_data)))
|
||||
goto err_g4;
|
||||
|
||||
DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
|
||||
driver->name, driver->major, driver->minor, driver->patchlevel,
|
||||
driver->date, dev->primary->index);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue