[PATCH driver/ast 13/15] Fix ABI version conflict in xf86UnclaimPciSlot()
Egbert Eich
eich at freedesktop.org
Thu Apr 24 10:37:01 PDT 2014
From: Egbert Eich <eich at suse.de>
xf86UnclaimPciSlot() received a GDevPtr as 2nd argument with
ABI_VIDEODRV_VERSION 13.
Signed-off-by: Egbert Eich <eich at suse.de>
---
src/ast_driver.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/ast_driver.c b/src/ast_driver.c
index b6accbf..be1ac0f 100644
--- a/src/ast_driver.c
+++ b/src/ast_driver.c
@@ -281,7 +281,11 @@ ASTProbe(DriverPtr drv, int flags)
pPci->device_id, pPci->bus, pPci->domain, pPci->dev, pPci->func);
xf86DrvMsg(0, X_ERROR,
"ast: This driver cannot operate until it has been unloaded.\n");
- xf86UnclaimPciSlot(pPci, devSections[0]);
+ xf86UnclaimPciSlot(pPci
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 13
+ , devSections[0]
+#endif
+ );
free(devSections);
return FALSE;
}
--
1.8.4.5
More information about the xorg-devel
mailing list