[PATCH xf86-video-ati 1/3] radeon_open_drm_master get rid of unnecessary goto

Hans de Goede hdegoede at redhat.com
Mon Mar 17 03:30:09 PDT 2014


Signed-off-by: Hans de Goede <hdegoede at redhat.com>
---
 src/radeon_kms.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 4f1f5ee..16a1b5f 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -594,9 +594,9 @@ static Bool radeon_open_drm_master(ScrnInfoPtr pScrn)
 	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 		   " reusing fd for second head\n");
 
-	info->dri2.drm_fd = pRADEONEnt->fd;
+	info->drmmode.fd = info->dri2.drm_fd = pRADEONEnt->fd;
 	pRADEONEnt->fd_ref++;
-	goto out;
+	return TRUE;
     }
 
 #if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,9,99,901,0)
@@ -638,7 +638,6 @@ static Bool radeon_open_drm_master(ScrnInfoPtr pScrn)
 
     pRADEONEnt->fd = info->dri2.drm_fd;
     pRADEONEnt->fd_ref = 1;
- out:
     info->drmmode.fd = info->dri2.drm_fd;
     return TRUE;
 }
-- 
1.9.0



More information about the xorg-devel mailing list