diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2014-03-17 10:36:55 +0100 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2014-03-17 10:53:45 +0100 |
| commit | a63342ad15408071437c80b411d14196f3288aed (patch) | |
| tree | 3840a9057a37fe10c35f6f84f4092ca629bb05e7 | |
| parent | bdc412044f6ced056cd57320d1b2ee0d967c2191 (diff) | |
radeon_open_drm_master get rid of unnecessary goto
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| -rw-r--r-- | src/radeon_kms.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/radeon_kms.c b/src/radeon_kms.c index 4f1f5ee9..16a1b5f3 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; } |