summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2014-02-21 12:48:42 +1000
committerDave Airlie <airlied@redhat.com>2014-02-21 12:49:23 +1000
commitbf359b118a0870f18a229d33979270ac2f0f5dcd (patch)
tree60b3216773dc694aa3b4801b5852882c3ed54def
parent677935b2d20f54f21c645b5eb386b6c9485fee5f (diff)
modesetting: move closing fd to after we check outputs
On something like cirrus, start X, then attempt to start a second X while the first is running, if fbdev is installed it'll fail hard. Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--src/driver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/driver.c b/src/driver.c
index b28622a..4a74ece 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -258,11 +258,11 @@ static Bool probe_hw_pci(const char *dev, struct pci_device *pdev)
id = drmGetBusid(fd);
devid = ms_DRICreatePCIBusID(pdev);
- close(fd);
if (id && devid && !strcmp(id, devid))
ret = check_outputs(fd);
+ close(fd);
free(id);
free(devid);
return ret;