diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-25 17:56:10 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-25 17:56:10 +0100 |
| commit | ba6115f56f066621a20fa545ddd67721afd35523 (patch) | |
| tree | 418b724d4f318d24dc8e5183e6b252922f85f149 /xorg-server/config/udev.c | |
| parent | eb71c0f23999d1cc156e1821d73634ec79621fc2 (diff) | |
| parent | e0927d908a12c9c140458c355b29b884a7705f2d (diff) | |
| download | vcxsrv-ba6115f56f066621a20fa545ddd67721afd35523.tar.gz vcxsrv-ba6115f56f066621a20fa545ddd67721afd35523.tar.bz2 vcxsrv-ba6115f56f066621a20fa545ddd67721afd35523.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/hw/xwin/InitInput.c
xorg-server/hw/xwin/InitOutput.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winglobals.h
xorg-server/hw/xwin/winmsgwindow.c
xorg-server/hw/xwin/winmultiwindowwm.c
xorg-server/hw/xwin/winmultiwindowwndproc.c
Diffstat (limited to 'xorg-server/config/udev.c')
| -rw-r--r-- | xorg-server/config/udev.c | 32 |
1 files changed, 6 insertions, 26 deletions
diff --git a/xorg-server/config/udev.c b/xorg-server/config/udev.c index d88abaaa1..a1b72c13b 100644 --- a/xorg-server/config/udev.c +++ b/xorg-server/config/udev.c @@ -55,7 +55,7 @@ static struct udev_monitor *udev_monitor; #ifdef CONFIG_UDEV_KMS -static Bool +static void config_udev_odev_setup_attribs(const char *path, const char *syspath, int major, int minor, config_odev_probe_proc_ptr probe_callback); @@ -457,40 +457,20 @@ config_udev_fini(void) #ifdef CONFIG_UDEV_KMS -static Bool +static void config_udev_odev_setup_attribs(const char *path, const char *syspath, int major, int minor, config_odev_probe_proc_ptr probe_callback) { struct OdevAttributes *attribs = config_odev_allocate_attribute_list(); - int ret; - - if (!attribs) - return FALSE; - - ret = config_odev_add_attribute(attribs, ODEV_ATTRIB_PATH, path); - if (ret == FALSE) - goto fail; - - ret = config_odev_add_attribute(attribs, ODEV_ATTRIB_SYSPATH, syspath); - if (ret == FALSE) - goto fail; - - ret = config_odev_add_int_attribute(attribs, ODEV_ATTRIB_MAJOR, major); - if (ret == FALSE) - goto fail; - ret = config_odev_add_int_attribute(attribs, ODEV_ATTRIB_MINOR, minor); - if (ret == FALSE) - goto fail; + config_odev_add_attribute(attribs, ODEV_ATTRIB_PATH, path); + config_odev_add_attribute(attribs, ODEV_ATTRIB_SYSPATH, syspath); + config_odev_add_int_attribute(attribs, ODEV_ATTRIB_MAJOR, major); + config_odev_add_int_attribute(attribs, ODEV_ATTRIB_MINOR, minor); /* ownership of attribs is passed to probe layer */ probe_callback(attribs); - return TRUE; -fail: - config_odev_free_attributes(attribs); - free(attribs); - return FALSE; } void |