From 6e7f88fe09dfe20e6c800313088c7bb03155b76f Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 2 Mar 2018 11:55:51 +0100 Subject: [PATCH] logind: open device if needed Fixes: #8291 --- src/login/logind-session-device.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c index 64a6bd273..ca0c512a1 100644 --- a/src/login/logind-session-device.c +++ b/src/login/logind-session-device.c @@ -197,11 +197,19 @@ static int session_device_start(SessionDevice *sd) { switch (sd->type) { case DEVICE_TYPE_DRM: - /* Device is kept open. Simply call drmSetMaster() and hope there is no-one else. In case it fails, we - * keep the device paused. Maybe at some point we have a drmStealMaster(). */ - r = sd_drmsetmaster(sd->fd); - if (r < 0) - return r; + + if (sd->fd < 0) { + /* Open device if it isn't open yet */ + sd->fd = session_device_open(sd, true); + if (sd->fd < 0) + return sd->fd; + } else { + /* Device is kept open. Simply call drmSetMaster() and hope there is no-one else. In case it fails, we + * keep the device paused. Maybe at some point we have a drmStealMaster(). */ + r = sd_drmsetmaster(sd->fd); + if (r < 0) + return r; + } break; case DEVICE_TYPE_EVDEV: -- 2.30.2