From 34057611c67b751c43d6bd70a7d5993708262cd2 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 25 Nov 2013 09:36:32 +0000 Subject: [PATCH] Correct type of uevent_handler xf86AddGeneralHandler returns an opaque pointer, not a function pointer. Reported-by: Zdenek Kabelac Signed-off-by: Chris Wilson --- src/sna/sna.h | 2 +- src/sna/sna_driver.c | 6 ++---- src/uxa/intel.h | 2 +- src/uxa/intel_driver.c | 6 ++---- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/sna/sna.h b/src/sna/sna.h index b3e38a3..8a7a94f 100644 --- a/src/sna/sna.h +++ b/src/sna/sna.h @@ -329,7 +329,7 @@ struct sna { #if HAVE_UDEV struct udev_monitor *uevent_monitor; - InputHandlerProc uevent_handler; + pointer uevent_handler; #endif struct { diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c index d89fb1f..4a96faf 100644 --- a/src/sna/sna_driver.c +++ b/src/sna/sna_driver.c @@ -766,10 +766,8 @@ sna_uevent_init(ScrnInfoPtr scrn) return; } - sna->uevent_handler = - xf86AddGeneralHandler(udev_monitor_get_fd(mon), - sna_handle_uevents, - scrn); + sna->uevent_handler = xf86AddGeneralHandler(udev_monitor_get_fd(mon), + sna_handle_uevents, scrn); if (!sna->uevent_handler) { udev_monitor_unref(mon); udev_unref(u); diff --git a/src/uxa/intel.h b/src/uxa/intel.h index ded975f..6ac770e 100644 --- a/src/uxa/intel.h +++ b/src/uxa/intel.h @@ -351,7 +351,7 @@ typedef struct intel_screen_private { unsigned debug_flush; #if HAVE_UDEV struct udev_monitor *uevent_monitor; - InputHandlerProc uevent_handler; + pointer uevent_handler; #endif Bool has_prime_vmap_flush; } intel_screen_private; diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c index e035973..46e06df 100644 --- a/src/uxa/intel_driver.c +++ b/src/uxa/intel_driver.c @@ -875,10 +875,8 @@ I830UeventInit(ScrnInfoPtr scrn) return; } - intel->uevent_handler = - xf86AddGeneralHandler(udev_monitor_get_fd(mon), - I830HandleUEvents, - scrn); + intel->uevent_handler = xf86AddGeneralHandler(udev_monitor_get_fd(mon), + I830HandleUEvents, scrn); if (!intel->uevent_handler) { udev_monitor_unref(mon); udev_unref(u); -- 2.7.4