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
commit75f45bb3afeb8ba02789cfdb129d79c136ee037c (patch)
tree128ae9ff6647621df1e38e878d286041646d2656
parent36f0c36b373a9b877f4e83e325add3cc980eee47 (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--hw/xfree86/drivers/modesetting/src/driver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xfree86/drivers/modesetting/src/driver.c b/hw/xfree86/drivers/modesetting/src/driver.c
index b28622a..4a74ece 100644
--- a/hw/xfree86/drivers/modesetting/src/driver.c
+++ b/hw/xfree86/drivers/modesetting/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;