From 66d36010a324480ac656e702e53f9c1f6fb60d5c Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 12 Sep 2018 10:56:40 +1000 Subject: [PATCH] modesetting: get pEnt after error checks This saves us having to make sure we clean it up. Pointed out by coverity. Signed-off-by: Dave Airlie (cherry picked from commit b6c29a881eb49300fddfd0187cb10891f5257d3b) --- hw/xfree86/drivers/modesetting/driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c index 792dfb655..8d29b130f 100644 --- a/hw/xfree86/drivers/modesetting/driver.c +++ b/hw/xfree86/drivers/modesetting/driver.c @@ -900,8 +900,6 @@ PreInit(ScrnInfoPtr pScrn, int flags) if (pScrn->numEntities != 1) return FALSE; - pEnt = xf86GetEntityInfo(pScrn->entityList[0]); - if (flags & PROBE_DETECT) { return FALSE; } @@ -910,6 +908,8 @@ PreInit(ScrnInfoPtr pScrn, int flags) if (!GetRec(pScrn)) return FALSE; + pEnt = xf86GetEntityInfo(pScrn->entityList[0]); + ms = modesettingPTR(pScrn); ms->SaveGeneration = -1; ms->pEnt = pEnt;