mirror of
https://gitlab.freedesktop.org/wlroots/wlroots.git
synced 2026-02-05 04:06:11 -05:00
session: simplify libudev unref handling
Signed-off-by: sunzhguy <sunzhigang1@kylinos.cn>
This commit is contained in:
parent
16cb509a6e
commit
9119b8aa85
1 changed files with 2 additions and 4 deletions
|
|
@ -488,6 +488,7 @@ ssize_t wlr_session_find_gpus(struct wlr_session *session,
|
||||||
|
|
||||||
if (udev_enumerate_get_list_entry(en) == NULL) {
|
if (udev_enumerate_get_list_entry(en) == NULL) {
|
||||||
udev_enumerate_unref(en);
|
udev_enumerate_unref(en);
|
||||||
|
en = NULL;
|
||||||
wlr_log(WLR_INFO, "Waiting for a KMS device");
|
wlr_log(WLR_INFO, "Waiting for a KMS device");
|
||||||
|
|
||||||
struct find_gpus_add_handler handler = {0};
|
struct find_gpus_add_handler handler = {0};
|
||||||
|
|
@ -501,7 +502,6 @@ ssize_t wlr_session_find_gpus(struct wlr_session *session,
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
wlr_log_errno(WLR_ERROR, "Failed to wait for KMS device: "
|
wlr_log_errno(WLR_ERROR, "Failed to wait for KMS device: "
|
||||||
"wl_event_loop_dispatch failed");
|
"wl_event_loop_dispatch failed");
|
||||||
udev_enumerate_unref(en);
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -562,13 +562,11 @@ ssize_t wlr_session_find_gpus(struct wlr_session *session,
|
||||||
|
|
||||||
struct wlr_device *wlr_dev =
|
struct wlr_device *wlr_dev =
|
||||||
session_open_if_kms(session, udev_device_get_devnode(dev));
|
session_open_if_kms(session, udev_device_get_devnode(dev));
|
||||||
|
udev_device_unref(dev);
|
||||||
if (!wlr_dev) {
|
if (!wlr_dev) {
|
||||||
udev_device_unref(dev);
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
udev_device_unref(dev);
|
|
||||||
|
|
||||||
ret[i] = wlr_dev;
|
ret[i] = wlr_dev;
|
||||||
if (is_primary) {
|
if (is_primary) {
|
||||||
struct wlr_device *tmp = ret[0];
|
struct wlr_device *tmp = ret[0];
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue