From: Dave Airlie <airlied@redhat.com>
Date: Fri, 7 Mar 2008 01:25:26 +0000 (+1100)
Subject: worst merge effort ever
X-Git-Tag: submit/1.0/20121108.012404~642^2~234^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=348d95e00be73b650dabcf121e6b18d669bf4192;p=profile%2Fivi%2Flibdrm.git

worst merge effort ever
---

diff --git a/linux-core/drm_stub.c b/linux-core/drm_stub.c
index ba13e5e..6856075 100644
--- a/linux-core/drm_stub.c
+++ b/linux-core/drm_stub.c
@@ -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);